new dtp管理 配置信息管理

health-admin/src/main/java/com/bzd/web/controller/DTP/ConfigInfoController.java

@@ -0,0 +1,159 @@
+package com.bzd.web.controller.DTP;
+
+import com.bzd.common.annotation.Log;
+import com.bzd.common.config.dao.PageData;
+import com.bzd.common.core.controller.BaseController;
+import com.bzd.common.core.domain.AjaxResult;
+import com.bzd.common.core.page.TableDataInfo;
+import com.bzd.common.enums.BusinessType;
+import com.bzd.system.service.DTPService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 配置信息管理
+ * creator wsp
+ */
+@Controller
+@RequestMapping("/dtp/configInfo")
+public class ConfigInfoController extends BaseController {
+    private String prefix = "dtp/configInfo";
+    @Autowired
+    private DTPService dtpService;
+    @RequiresPermissions("dtp:configInfo:view")
+    @GetMapping("/storeTag")
+    public String storeTag()
+    {
+        return prefix + "/storeTag";
+    }
+    @RequiresPermissions("dtp:configInfo:view")
+    @GetMapping("/dtpHospital")
+    public String dtpHospital()
+    {
+        return prefix + "/dtpHospital";
+    }
+    @RequiresPermissions("dtp:configInfo:view")
+    @GetMapping("/drugList")
+    public String drugList()
+    {
+        return prefix + "/drugList";
+    }
+    @RequiresPermissions("dtp:configInfo:view")
+    @GetMapping("/AssociatedPrescription/{id}")
+    public String AssociatedPrescription(@PathVariable("id") Long id, ModelMap mmap) throws Exception {
+        PageData pd = this.getPageData();
+        pd.put("id",id);
+        PageData pageData = dtpService.findForList(pd).get(0);
+        mmap.putAll(pageData);
+        return prefix + "/AssociatedPrescription";
+    }
+ /**配置信息查询**/
+    /**
+     * 一店一目标签
+     */
+    @RequiresPermissions("dtp:configInfo:list")
+    @PostMapping("/storeTagList")
+    @ResponseBody
+    public TableDataInfo storeTagList() throws Exception {
+        PageData pd = this.getPageData();
+        startPage();
+        List<PageData> pageData = dtpService.findstoreTagList(pd);
+        return  getDataTable(pageData);
+    }
+    /**
+     *DTP医院查询
+     */
+    @RequiresPermissions("dtp:configInfo:list")
+    @PostMapping("/dtpHospitalList")
+    @ResponseBody
+    public TableDataInfo dtpHospitalList() throws Exception {
+        PageData pd = this.getPageData();
+        startPage();
+        List<PageData> pageData = dtpService.findHospitalList(pd);
+        return  getDataTable(pageData);
+    }
+    /**
+     * 药品名单
+     */
+    @RequiresPermissions("dtp:configInfo:list")
+    @PostMapping("/drugListList")
+    @ResponseBody
+    public TableDataInfo drugListList() throws Exception {
+        PageData pd = this.getPageData();
+        startPage();
+        List<PageData> pageData = dtpService.findstoreTagList(pd);
+        return  getDataTable(pageData);
+    }
+    /**
+     * 新增配置信息页面
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("posts", 1);
+        return prefix + "/add";
+    }
+    /**
+     * 配置信息新增保存
+     */
+    //@RequiresPermissions("server:serv:add")
+    @Log(title = "配置信息新增", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave() throws Exception {
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        if (!dtpService.checkPatientNameAndPhoneUnique(pd))
+        {
+            return error("处方登记新增： '" + pd.getString("patientName") +"+"+ pd.getString("patientPhone")+"'失败，患者姓名或电话已存在");
+        }
+        Integer integer = dtpService.save(pd);
+        return toAjax(integer);
+    }
+
+    @Log(title = "配置信息删除", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove() throws Exception
+    {
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        Integer integer = dtpService.del(pd);
+        return toAjax(integer);
+    }
+
+    @RequiresPermissions("dtp:configInfo:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)throws Exception
+    {
+        PageData pd = this.getPageData();
+        pd.put("id",id);
+        PageData pageData = dtpService.findForList(pd).get(0);
+        mmap.putAll(pageData);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 保存处方登记修改信息
+     */
+    @RequiresPermissions("dtp:configInfo:edit")
+    @Log(title = "处方登记管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave() throws Exception
+    {
+        PageData pd = this.getPageData();
+        Integer update = dtpService.update(pd);
+        if(update!=1){
+            return error("修改失败");
+        }
+        return toAjax(dtpService.update(pd));
+    }
+
+
+}

health-admin/src/main/resources/templates/DTP/configInfo/AssociatedPrescription.html

@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('DTP医院')" />
+	<th:block th:include="include :: layout-latest-css" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<body class="gray-bg">
+
+<div class="ui-layout-center">
+	<div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="tag-form">
+					<input type="hidden" id="deptId" name="deptId">
+					<input type="hidden" id="parentId" name="parentId">
+					<div class="select-list">
+						<ul>
+							<li>
+								医院名称：<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			<div class="col-sm-12 select-table table-striped">
+				<table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+</div>
+
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: layout-latest-js" />
+<th:block th:include="include :: ztree-js" />
+<script th:inline="javascript">
+	var GLCF = [[${@permission.hasPermi('dtp:configInfo:view')}]];
+	var prefix = ctx + "dtp/configInfo";
+
+	$(function() {
+		var panehHidden = false;
+		if ($(this).width() < 1590) {
+			panehHidden = true;
+		}
+		$('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
+		// 回到顶部绑定
+		if ($.fn.toTop !== undefined) {
+			var opt = {
+				win:$('.ui-layout-center'),
+				doc:$('.ui-layout-center')
+			};
+			$('#scroll-up').toTop(opt);
+		}
+		queryUserList();
+	});
+
+	function queryUserList() {
+		var options = {
+			url: prefix + "/dtpHospitalList",
+			viewUrl: prefix + "/AssociatedPrescription/{id}",
+			sortName: "createTime",
+			sortOrder: "desc",
+			modalName: "医院名单",
+			columns: [
+				{
+					field: "id",
+					title: "医院主键",
+					align: 'center',
+					visible: true,
+				},{
+					field: "standardName",
+					title: "医院标准名称",
+					align: 'center',
+				},
+				{
+					"field": "address",
+					"title": "医院地址",
+					align: 'center',
+				},{
+					"field": "phone",
+					"title": "医院电话",
+					align: 'center',
+				} ,{
+					title: '操作',
+					align: 'center',
+					formatter: function(value, row, index) {
+						if (row.id) {
+							var actions = [];
+							actions.push('<a class="btn btn-success btn-xs' + GLCF + '" href="javascript:void(0)" onclick="viewPrescription(\'' + row.id + '\')"><i class="fa fa-search"></i>\t查看关联处方</a>');
+							return actions.join('');
+						} else {
+							return "";
+						}
+					}
+				}]
+		};
+		$.table.init(options);
+	}
+
+	$('#btnExpand').click(function() {
+		$._tree.expandAll(true);
+		$(this).hide();
+		$('#btnCollapse').show();
+	});
+
+	$('#btnCollapse').click(function() {
+		$._tree.expandAll(false);
+		$(this).hide();
+		$('#btnExpand').show();
+	});
+
+	$('#btnRefresh').click(function() {
+	});
+
+	/* 用户管理-新增-选择部门树 */
+	function selectDeptTree() {
+		var treeId = $("#treeId").val();
+		var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+		var url = ctx + "system/user/selectDeptTree/" + deptId;
+		var options = {
+			title: '选择部门',
+			width: "380",
+			url: url,
+			callBack: doSubmit
+		};
+		$.modal.openOptions(options);
+	}
+
+	function doSubmit(index, layero){
+		var body = $.modal.getChildFrame(index);
+		$("#treeId").val(body.find('#treeId').val());
+		$("#treeName").val(body.find('#treeName').val());
+		$.modal.close(index);
+	}
+
+	/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+	function resetPre() {
+		resetDate();
+		$("#tag-form")[0].reset();
+		$("#deptId").val("");
+		$("#parentId").val("");
+		$(".curSelectedNode").removeClass("curSelectedNode");
+		$.table.search();
+	}
+	function viewPrescription(id){
+		var url = prefix + "/AssociatedPrescription/" + id;
+		$.modal.openTab("关联处方", url);
+	}
+</script>
+</body>
+
+</html>

health-admin/src/main/resources/templates/DTP/configInfo/addDrug.html

@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增处方')" />
+    <th:block th:include="include :: select2-css" />
+</head>
+<body>
+<div class="main-content">
+    <form id="form-user-add" class="form-horizontal">
+        <input name="deptId" type="hidden" id="treeId"/>
+        <h4 class="form-header h4">配送单信息</h4>
+        <div class="row">
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label>预计配送时间</label>
+                    <input type="text" class="time-input" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" />
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <div class="form-group">
+                        <label>实际配送时间</label>
+                        <input type="text" class="time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">所属连锁：</label>
+                    <div class="col-sm-8">
+                        <div class="input-group">
+                        <input name="chainName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control">
+                        <span class="input-group-addon">
+                        <i class="fa fa-search"></i>
+                    </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">所属门店：</label>
+                    <div class="col-sm-8">
+                        <select name="storeName" class="form-control" th:with="type=${@dict.getType('sys_select_store')}">
+                            <option value="">请选择</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label">是否线上签收：</label>
+                    <div class="col-sm-4">
+                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">配送状态：</label>
+                    <div class="col-sm-4">
+                        <select name="deliveryStatus"  class="form-control"  th:with="type=${@dict.getType('sys_select_pszt')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">冷链类型：</label>
+                    <div class="col-sm-4">
+                        <select name="coldChainType"  class="form-control"  th:with="type=${@dict.getType('sys_select_cold_type')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">订单来源：</label>
+                    <div class="col-sm-4">
+                        <select name="orderSource"  class="form-control"  th:with="type=${@dict.getType('sys_select_order_sources')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">收货人：</label>
+                    <div class="col-sm-8">
+                        <input id="recipientName" name="recipientName"  type="text" maxlength="100"  class="form-control" placeholder="请输入收货人">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">收货电话：</label>
+                    <div class="col-sm-8">
+                        <input id="recipientPhone" name="recipientPhone"  type="number" maxlength="11"  class="form-control" placeholder="请输入收货电话">
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">冰排编号：</label>
+
+                    <div class="col-sm-8">
+                        <input id="icePackNumber" name="icePackNumber" placeholder="请输入冰排编号" class="form-control" type="text" maxlength="50" >
+                    </div>
+                </div>
+            </div>
+
+
+        </div>
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">收货地址：</label>
+                    <div class="col-sm-8">
+                        <input id="recipientAddress" name="recipientAddress"  type="text" maxlength="1000"  class="form-control" placeholder="请输入收货地址">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">出发温度：</label>
+                    <div class="col-sm-8">
+                        <input id="departureTemperature" name="departureTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入出发温度">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">送达温度：</label>
+                    <div class="col-sm-8">
+                        <input id="arrivalTemperature" name="arrivalTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入送达温度">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+        <div class="col-sm-4">
+            <div class="form-group">
+                <label class="col-sm-4 control-label">签收照片：</label>
+                <div class="col-sm-8">
+                    <input id="signaturePhoto" name="signaturePhoto"  type="text" maxlength="1000"  class="form-control" placeholder="签收照片">
+                </div>
+            </div>
+        </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">配送员：</label>
+                    <div class="col-sm-8">
+                        <input id="deliveryPerson" name="deliveryPerson" placeholder="请输入配送员" class="form-control" type="text" maxlength="50" >
+                    </div>
+                </div>
+            </div>
+
+
+        <div class="col-sm-4">
+            <div class="form-group">
+                <label class="col-sm-4 control-label">配送箱编号：</label>
+                <div class="col-sm-8">
+                    <input id="deliveryBoxNumber" name="deliveryBoxNumber"  type="text" maxlength="25"  class="form-control" placeholder="配送箱编号">
+                </div>
+            </div>
+        </div>
+        </div>
+        <h4 class="form-header h4">其他信息</h4>
+        <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">付款顺序：</label>
+                        <div class="col-sm-8">
+                            <select name="paymentSequence" class="form-control" th:with="type=${@dict.getType('sys_select_payment_sequence')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                ></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+        </div>
+
+    </form>
+</div>
+
+<div class="row">
+    <div class="col-sm-offset-5 col-sm-10">
+        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+        <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<script>
+    var prefix = ctx + "dtp/cold";
+    var prescriptionTypes = [
+        { label: '电子处方', value: 'electronic' },
+        { label: '纸质处方', value: 'paper' }
+    ];
+
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            var data = $("#form-user-add").serializeArray();
+
+            $.operate.saveTab(prefix + "/add", data);
+        }
+    }
+
+    /* 用户管理-新增-选择部门树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择部门',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+
+    $(function() {
+        $('#post').select2({
+            placeholder: "请选择岗位",
+            allowClear: true
+        });
+    })
+</script>
+</body>
+</html>

health-admin/src/main/resources/templates/DTP/configInfo/drugList.html

@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('配送单据打印列表')" />
+	<th:block th:include="include :: layout-latest-css" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<body class="gray-bg">
+
+	<div class="ui-layout-center">
+		<div class="container-div">
+			<div class="row">
+				<div class="col-sm-12 search-collapse">
+					<form id="user-form">
+						<div class="select-list">
+							<ul>
+
+								<li>
+									<label>配送时间 </label>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="deliveryTimeStart"/>
+									<span>-</span>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="deliveryTimeEnd"/>
+								</li>
+								<li>
+									<label style="width: 90px; float: left;">打印申请时间 </label>
+									<input type="text" class="time-input" id="startTimes" placeholder="开始时间" name="printRequestTimeStart"/>
+									<span>-</span>
+									<input type="text" class="time-input" id="endTimes" placeholder="结束时间" name="printRequestTimeEnd"/>
+								</li>
+								<li>
+									<label>配送人： </label>
+									<input type="text"  placeholder="请输入配送人姓名" name="deliverer"/>
+								</li>
+								<li>
+									<label>打印状态:</label>
+									<select name="status"  th:with="type=${@dict.getType('sys_select_print_status')}">
+										<option value="">全部</option>
+										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+												></option>
+									</select>
+								</li>
+
+								<li>
+									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+								</li>
+							</ul>
+						</div>
+					</form>
+				</div>
+
+		        <div class="btn-group-sm" id="toolbar" role="group">
+
+		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sdtp:print:remove">
+		                <i class="fa fa-remove"></i> 删除
+		            </a>
+
+
+		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="dtp:print:export">
+			            <i class="fa fa-download"></i> 打印
+			        </a>
+		        </div>
+
+		        <div class="col-sm-12 select-table table-striped">
+				    <table id="bootstrap-table"></table>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: ztree-js" />
+	<script th:inline="javascript">
+		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
+		var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
+		var detailFlag = [[${@permission.hasPermi('dtp:print:view')}]];
+		var prefix = ctx + "dtp/print";
+
+		$(function() {
+		    var panehHidden = false;
+		    if ($(this).width() < 1590) {
+		        panehHidden = true;
+		    }
+		    $('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
+	     	// 回到顶部绑定
+	    	if ($.fn.toTop !== undefined) {
+	    		var opt = {
+	    			win:$('.ui-layout-center'),
+	    			doc:$('.ui-layout-center')
+	    		};
+	    		$('#scroll-up').toTop(opt);
+	    	}
+		    queryUserList();
+		});
+
+		function queryUserList() {
+		    var options = {
+		        url: prefix + "/list",
+		        viewUrl: prefix + "/view/{id}",
+		        createUrl: prefix + "/add",
+		        updateUrl: prefix + "/edit/{id}",
+				detailUrl: prefix + "/detail/{id}",
+		        removeUrl: prefix + "/remove",
+		        exportUrl: prefix + "/export",
+		        sortName: "createTime",
+		        sortOrder: "desc",
+		        modalName: "配送单据打印信息",
+		        columns: [{
+		            checkbox: true
+		        },
+					{
+						field: "id",
+						title: "id",
+						//hidden:false
+						visible: false,
+					},
+					{
+						field: "orderId",
+						title: "订单编号"
+					},
+					{
+						field: "deliverer",
+						title: "配送人"
+					},
+					{
+						field: "deliveryTime",
+						title: "配送时间"
+					},
+					{
+						field: "printRequestTime",
+						title: "打印申请时间"
+					},
+					{
+						field: "status",
+						title: "打印状态"
+					},
+					{
+						field: "createTime",
+						title: "创建时间"
+					},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		                if (row.orderId) {
+		                	var actions = [];
+							actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a>');
+			                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
+			                return actions.join('');
+		            	} else {
+		                    return "";
+		                }
+		            }
+		        }]
+		    };
+		    $.table.init(options);
+		}
+
+
+
+		$('#btnExpand').click(function() {
+			$._tree.expandAll(true);
+		    $(this).hide();
+		    $('#btnCollapse').show();
+		});
+
+		$('#btnCollapse').click(function() {
+			$._tree.expandAll(false);
+		    $(this).hide();
+		    $('#btnExpand').show();
+		});
+
+		$('#btnRefresh').click(function() {
+		});
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+		function resetPre() {
+			resetDate();
+			$("#user-form")[0].reset();
+			$("#deptId").val("");
+			$("#parentId").val("");
+			$(".curSelectedNode").removeClass("curSelectedNode");
+			$.table.search();
+		}
+
+	</script>
+</body>
+
+</html>

health-admin/src/main/resources/templates/DTP/configInfo/dtpHospital.html

@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('DTP医院')" />
+	<th:block th:include="include :: layout-latest-css" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<body class="gray-bg">
+
+<div class="ui-layout-center">
+	<div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="tag-form">
+					<input type="hidden" id="deptId" name="deptId">
+					<input type="hidden" id="parentId" name="parentId">
+					<div class="select-list">
+						<ul>
+							<li>
+								医院名称：<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			<div class="col-sm-12 select-table table-striped">
+				<table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+</div>
+
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: layout-latest-js" />
+<th:block th:include="include :: ztree-js" />
+<script th:inline="javascript">
+	var GLCF = [[${@permission.hasPermi('dtp:configInfo:view')}]];
+	var prefix = ctx + "dtp/configInfo";
+
+	$(function() {
+		var panehHidden = false;
+		if ($(this).width() < 1590) {
+			panehHidden = true;
+		}
+		$('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
+		// 回到顶部绑定
+		if ($.fn.toTop !== undefined) {
+			var opt = {
+				win:$('.ui-layout-center'),
+				doc:$('.ui-layout-center')
+			};
+			$('#scroll-up').toTop(opt);
+		}
+		queryUserList();
+	});
+
+	function queryUserList() {
+		var options = {
+			url: prefix + "/dtpHospitalList",
+			viewUrl: prefix + "/AssociatedPrescription/{id}",
+			sortName: "createTime",
+			sortOrder: "desc",
+			modalName: "医院名单",
+			columns: [
+				{
+					field: "id",
+					title: "医院主键",
+					align: 'center',
+					visible: true,
+				},{
+					field: "standardName",
+					title: "医院标准名称",
+					align: 'center',
+				},
+				{
+					"field": "address",
+					"title": "医院地址",
+					align: 'center',
+				},{
+					"field": "phone",
+					"title": "医院电话",
+					align: 'center',
+				} ,{
+					title: '操作',
+					align: 'center',
+					formatter: function(value, row, index) {
+						if (row.id) {
+							var actions = [];
+							actions.push('<a class="btn btn-success btn-xs' + GLCF + '" href="javascript:void(0)" onclick="viewPrescription(\'' + row.id + '\')"><i class="fa fa-search"></i>\t查看关联处方</a>');
+							return actions.join('');
+						} else {
+							return "";
+						}
+					}
+				}]
+		};
+		$.table.init(options);
+	}
+
+	$('#btnExpand').click(function() {
+		$._tree.expandAll(true);
+		$(this).hide();
+		$('#btnCollapse').show();
+	});
+
+	$('#btnCollapse').click(function() {
+		$._tree.expandAll(false);
+		$(this).hide();
+		$('#btnExpand').show();
+	});
+
+	$('#btnRefresh').click(function() {
+	});
+
+	/* 用户管理-新增-选择部门树 */
+	function selectDeptTree() {
+		var treeId = $("#treeId").val();
+		var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+		var url = ctx + "system/user/selectDeptTree/" + deptId;
+		var options = {
+			title: '选择部门',
+			width: "380",
+			url: url,
+			callBack: doSubmit
+		};
+		$.modal.openOptions(options);
+	}
+
+	function doSubmit(index, layero){
+		var body = $.modal.getChildFrame(index);
+		$("#treeId").val(body.find('#treeId').val());
+		$("#treeName").val(body.find('#treeName').val());
+		$.modal.close(index);
+	}
+
+	/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+	function resetPre() {
+		resetDate();
+		$("#tag-form")[0].reset();
+		$("#deptId").val("");
+		$("#parentId").val("");
+		$(".curSelectedNode").removeClass("curSelectedNode");
+		$.table.search();
+	}
+	function viewPrescription(id){
+		var url = prefix + "/AssociatedPrescription/" + id;
+		$.modal.openTab("关联处方", url);
+	}
+</script>
+</body>
+
+</html>

health-admin/src/main/resources/templates/DTP/configInfo/editDrug.html

@@ -0,0 +1,250 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改配送单')" />
+</head>
+<body>
+<div class="main-content">
+    <form class="form-horizontal" id="form-server-edit" th:object="${cold}">
+        <h4 class="form-header h4">处方信息</h4>
+        <input type="hidden" id="id" name="id" th:value="${id}">
+        <div class="row">
+            <div class="col-sm-3">
+                <label class="col-sm-4 control-label">预计配送时间</label>
+                <div class="form-group">
+                    <input type="text" class="styled-input time-input-new" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" th:value="${expectedDeliveryTime}"/>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">实际配送时间</label>
+                        <input type="text" class="styled-input time-input-new" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime" th:value="${expectedDeliveryTime}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">所属连锁：</label>
+                    <div class="col-sm-8">
+                        <div class="input-group">
+                            <input name="chainName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control" th:value="${chainName}">
+                            <span class="input-group-addon">
+                        <i class="fa fa-search"></i>
+                    </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">所属门店：</label>
+                    <div class="col-sm-8">
+                        <select name="storeName" class="form-control" th:with="type=${@dict.getType('sys_select_store')}">
+                            <option value="">请选择</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${storeName}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label">是否线上签收：</label>
+                    <div class="col-sm-4">
+                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictLabel}==${prescriptionType}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">配送状态：</label>
+                    <div class="col-sm-4">
+                        <select name="deliveryStatus"  class="form-control"  th:with="type=${@dict.getType('sys_select_pszt')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${deliveryStatus}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">冷链类型：</label>
+                    <div class="col-sm-4">
+                        <select name="coldChainType"  class="form-control"  th:with="type=${@dict.getType('sys_select_cold_type')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${coldChainType}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">订单来源：</label>
+                    <div class="col-sm-4">
+                        <select name="orderSource"  class="form-control"  th:with="type=${@dict.getType('sys_select_order_sources')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${orderSource}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">收货人：</label>
+                    <div class="col-sm-8">
+                        <input id="recipientName" name="recipientName"  type="text" maxlength="100"  class="form-control" placeholder="请输入收货人" th:value="${recipientName}">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">收货电话：</label>
+                    <div class="col-sm-8">
+                        <input id="recipientPhone" name="recipientPhone"  type="number" maxlength="11"  class="form-control" placeholder="请输入收货电话" th:value="${recipientPhone}">
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">冰排编号：</label>
+
+                    <div class="col-sm-8">
+                        <input id="icePackNumber" name="icePackNumber" placeholder="请输入冰排编号" class="form-control" type="text" maxlength="50" th:value="${icePackNumber}">
+                    </div>
+                </div>
+            </div>
+
+
+        </div>
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">收货地址：</label>
+                    <div class="col-sm-8">
+                        <input id="recipientAddress" name="recipientAddress"  type="text" maxlength="1000"  class="form-control" placeholder="请输入收货地址" th:value="${recipientAddress}">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">出发温度：</label>
+                    <div class="col-sm-8">
+                        <input id="departureTemperature" name="departureTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入出发温度" th:value="${departureTemperature}">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">送达温度：</label>
+                    <div class="col-sm-8">
+                        <input id="arrivalTemperature" name="arrivalTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入送达温度" th:value="${arrivalTemperature}">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">签收照片：</label>
+                    <div class="col-sm-8">
+                        <input id="signaturePhoto" name="signaturePhoto"  type="text" maxlength="1000"  class="form-control" placeholder="签收照片" th:value="${signaturePhoto}">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">配送员：</label>
+                    <div class="col-sm-8">
+                        <input id="deliveryPerson" name="deliveryPerson" placeholder="请输入配送员" class="form-control" type="text" maxlength="50"  th:value="${deliveryPerson}">
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">配送箱编号：</label>
+                    <div class="col-sm-8">
+                        <input id="deliveryBoxNumber" name="deliveryBoxNumber"  type="text" maxlength="25"  class="form-control" placeholder="配送箱编号" th:value="${deliveryBoxNumber}">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <h4 class="form-header h4">其他信息</h4>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">付款顺序：</label>
+                    <div class="col-sm-8">
+                        <select name="paymentSequence" class="form-control" th:with="type=${@dict.getType('sys_select_payment_sequence')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${paymentSequence}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="main-content">
+    <div class="col-sm-offset-5 col-sm-10">
+        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+        <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+</body>
+</html>
+
+<script>
+
+    /* 用户管理-新增-选择部门树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择部门',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+
+
+    function submitHandler() {
+        var prefix = ctx + "dtp/cold";
+        if ($.validate.form()) {
+            var data = $("#form-server-edit").serializeArray();
+            /*var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
+            var roleIds = $.form.selectCheckeds("role");
+            var postIds = $.form.selectSelects("post");
+            data.push({"name": "status", "value": status});
+            data.push({"name": "roleIds", "value": roleIds});
+            data.push({"name": "postIds", "value": postIds});*/
+            $.operate.saveTab(prefix + "/edit", data);
+        }
+    }
+</script>

health-admin/src/main/resources/templates/DTP/configInfo/storeTag.html

@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('一店一目标签')" />
+	<th:block th:include="include :: layout-latest-css" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<body class="gray-bg">
+
+	<div class="ui-layout-center">
+		<div class="container-div">
+			<div class="row">
+				<div class="col-sm-12 search-collapse">
+					<form id="tag-form">
+						<input type="hidden" id="deptId" name="deptId">
+						<input type="hidden" id="parentId" name="parentId">
+						<div class="select-list">
+							<ul>
+								<li>
+									MDM编码：<input type="text"  class="styled-input" placeholder="请输入MDM编码" name="mdmCode"/>
+								</li>
+								<li>
+									<label>门店:</label>
+									<input name="storeName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
+								</li>
+
+								<li>
+									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+								</li>
+							</ul>
+						</div>
+					</form>
+				</div>
+		        <div class="col-sm-12 select-table table-striped">
+				    <table id="bootstrap-table"></table>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: ztree-js" />
+	<script th:inline="javascript">
+		var viewFlag = [[${@permission.hasPermi('dtp:configInfo:list')}]];
+		var prefix = ctx + "dtp/configInfo";
+
+		$(function() {
+		    var panehHidden = false;
+		    if ($(this).width() < 1590) {
+		        panehHidden = true;
+		    }
+		    $('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
+	     	// 回到顶部绑定
+	    	if ($.fn.toTop !== undefined) {
+	    		var opt = {
+	    			win:$('.ui-layout-center'),
+	    			doc:$('.ui-layout-center')
+	    		};
+	    		$('#scroll-up').toTop(opt);
+	    	}
+		    queryUserList();
+		});
+
+		function queryUserList() {
+		    var options = {
+		        url: prefix + "/storeTagList",
+		        viewUrl: prefix + "/view/{id}",
+		        exportUrl: prefix + "/export",
+		        sortName: "createTime",
+		        sortOrder: "desc",
+		        modalName: "一店一目查询",
+		        columns: [
+					{
+						field: "id",
+						title: "id",
+						//hidden:false
+						visible: false,
+					},
+					{
+						field: "storeId",
+						title: "门店id"
+					},{
+						field: "storeCode",
+						title: "门店编码"
+					},
+					{
+						"field": "storeName",
+						"title": "门店名称"
+					},{
+						"field": "mdmCode",
+						"title": "MDM编码"
+					},{
+						"field": "productName",
+						"title": "药品商品名"
+					},{
+						"field": "genericName",
+						"title": "药品通用名"
+					},{
+						"field": "manufacturer",
+						"title": "厂家"
+					},{
+						"field": "specification",
+						"title": "规格"
+					},{
+						"field": "isPrescriptionItem",
+						"title": "是否为处方登记品"
+					},{
+						"field": "isFlipItem",
+						"title": "是否为上翻品"
+					},{
+						"field": "isFollowUpItem",
+						"title": "是否为随访品"
+					},
+					{
+						"field": "isMandatoryRegistration",
+						"title": "是否强制登记"
+					},
+					{
+						"field": "isColdChainItem",
+						"title": "是否为冷链品"
+					}]
+		    };
+		    $.table.init(options);
+		}
+
+		$('#btnExpand').click(function() {
+			$._tree.expandAll(true);
+		    $(this).hide();
+		    $('#btnCollapse').show();
+		});
+
+		$('#btnCollapse').click(function() {
+			$._tree.expandAll(false);
+		    $(this).hide();
+		    $('#btnExpand').show();
+		});
+
+		$('#btnRefresh').click(function() {
+		});
+
+		/* 用户管理-新增-选择部门树 */
+		function selectDeptTree() {
+			var treeId = $("#treeId").val();
+			var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+			var url = ctx + "system/user/selectDeptTree/" + deptId;
+			var options = {
+				title: '选择部门',
+				width: "380",
+				url: url,
+				callBack: doSubmit
+			};
+			$.modal.openOptions(options);
+		}
+
+		function doSubmit(index, layero){
+			var body = $.modal.getChildFrame(index);
+			$("#treeId").val(body.find('#treeId').val());
+			$("#treeName").val(body.find('#treeName').val());
+			$.modal.close(index);
+		}
+
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+		function resetPre() {
+			resetDate();
+			$("#tag-form")[0].reset();
+			$("#deptId").val("");
+			$("#parentId").val("");
+			$(".curSelectedNode").removeClass("curSelectedNode");
+			$.table.search();
+		}
+
+	</script>
+</body>
+
+</html>

health-admin/src/main/resources/templates/dtp/cold/add.html

@@ -13,14 +13,14 @@
             <div class="col-sm-3">
                 <div class="form-group">
                     <label>预计配送时间</label>
-                    <input type="text" class="time-input" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" />
+                    <input type="text" class="styled-input time-input" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" />
                 </div>
             </div>
             <div class="col-sm-3">
                 <div class="form-group">
                     <div class="form-group">
                         <label>实际配送时间</label>
-                        <input type="text" class="time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
+                        <input type="text" class="styled-input time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
                     </div>
                 </div>
             </div>

health-admin/src/main/resources/templates/dtp/cold/cold.html

@@ -18,46 +18,46 @@
 							<ul>
 								<li  class="select-time">
 									<label>创建日期</label>
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+									<input type="text" class="time-input" id="creationTimeStart" placeholder="开始时间" name="creationTimeStart"/>
 									<span>-</span>
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+									<input type="text" class="time-input" id="creationTimeEnd" placeholder="结束时间" name="creationTimeEnd"/>
 								</li>
 								<li  class="select-time">
 									<label>实际送达</label>
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="actualDeliveryTimeStart"/>
 									<span>-</span>
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="actualDeliveryTimeEnd"/>
 								</li>
 								<li>
 									<label>订单号：</label>
-									<input type="text" placeholder="请输入订单号" name="orderNumber"/>
+									<input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
 								</li>
 								<li>
 									<label>配送员：</label>
-									<input type="text"  placeholder="请输入配送员" name="deliveryPerson"/>
+									<input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
 								</li>
 								<li>
 									<label>收货人：</label>
-									<input type="text" placeholder="请输入收货人" name="recipientName"/>
+									<input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
 								</li>
 								<li>
 									<label>收货电话：</label>
-								<input type="text" placeholder="请输入收货电话" name="recipientPhone"/>
+								<input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
 								</li>
 								<li>
 									<label>配送状态:</label>
-									<select name="deliveryStatus"  th:with="type=${@dict.getType('sys_select_pszt')}">
+									<select name="deliveryStatus"  th:with="type=${@dict.getType('sys_select_pszt')}" class="styled-input">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 									</select>
 								</li>
 								<li>
 									<label>所属连锁:</label>
-										<input name="chainName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
+										<input name="chainName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
 								</li>
 								<li>
 									<label>冷链类型:</label>
-									<select name="coldChainType"  th:with="type=${@dict.getType('sys_select_cold_type')}">
+									<select name="coldChainType"  th:with="type=${@dict.getType('sys_select_cold_type')}" class="styled-input">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 												></option>
@@ -65,7 +65,7 @@
 								</li>
 								<li>
 									<label>付款顺序:</label>
-									<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}">
+									<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}" class="styled-input">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 										></option>
@@ -237,6 +237,7 @@
 					{
 						"field": "icePackNumber",
 						"title": "冰排编号"
+
 					},
 					// {
 					// 	"field": "paymentSequence",
@@ -254,6 +255,7 @@
 		        {
 		            title: '操作',
 		            align: 'center',
+					fixed: true, // 固定列
 		            formatter: function(value, row, index) {
 		                if (row.id) {
 		                	var actions = [];
@@ -269,62 +271,6 @@
 		    $.table.init(options);
 		}
 
-
-
-		$('#btnExpand').click(function() {
-			$._tree.expandAll(true);
-		    $(this).hide();
-		    $('#btnCollapse').show();
-		});
-
-		$('#btnCollapse').click(function() {
-			$._tree.expandAll(false);
-		    $(this).hide();
-		    $('#btnExpand').show();
-		});
-
-		$('#btnRefresh').click(function() {
-			//queryDeptTree();
-		});
-		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
-		function resetPre() {
-			resetDate();
-			$("#user-form")[0].reset();
-			$("#deptId").val("");
-			$("#parentId").val("");
-			$(".curSelectedNode").removeClass("curSelectedNode");
-			$.table.search();
-		}
-
-		/* 用户管理-部门 */
-		function dept() {
-			var url = ctx + "system/dept";
-			$.modal.openTab("部门管理", url);
-		}
-
-		/* 用户状态显示 */
-		function statusTools(row) {
-		    if (row.status == 1) {
-    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
-    		} else {
-    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
-    		}
-		}
-
-		/* 用户管理-停用 */
-		function disable(userId) {
-			$.modal.confirm("确认要停用用户吗？", function() {
-				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 1 });
-		    })
-		}
-
-		/* 用户管理启用 */
-		function enable(userId) {
-			$.modal.confirm("确认要启用用户吗？", function() {
-				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 0 });
-		    })
-		}
-
 		/* 用户管理-新增-选择部门树 */
 		function selectDeptTree() {
 			var treeId = $("#treeId").val();
@@ -345,6 +291,15 @@
 			$("#treeName").val(body.find('#treeName').val());
 			$.modal.close(index);
 		}
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+		function resetPre() {
+			resetDate();
+			$("#user-form")[0].reset();
+			$("#deptId").val("");
+			$("#parentId").val("");
+			$(".curSelectedNode").removeClass("curSelectedNode");
+			$.table.search();
+		}
 	</script>
 
 </body>

health-admin/src/main/resources/templates/dtp/cold/edit.html

@@ -1,188 +1,202 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('修改处方')" />
+    <th:block th:include="include :: header('修改配送单')" />
 </head>
 <body>
 <div class="main-content">
-    <form class="form-horizontal" id="form-server-edit" th:object="${recipe}">
+    <form class="form-horizontal" id="form-server-edit" th:object="${cold}">
         <h4 class="form-header h4">处方信息</h4>
         <input type="hidden" id="id" name="id" th:value="${id}">
         <div class="row">
-            <div class="col-sm-4">
+            <div class="col-sm-3">
+                <label class="col-sm-4 control-label">预计配送时间</label>
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">患者姓名：</label>
-                    <div class="col-sm-8">
-                        <input name="patientName" placeholder="请输入患者姓名" class="form-control" type="text" maxlength="30" th:value="${patientName}" >
+                    <input type="text" class="styled-input time-input-new" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" th:value="${expectedDeliveryTime}"/>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">实际配送时间</label>
+                        <input type="text" class="styled-input time-input-new" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime" th:value="${expectedDeliveryTime}"/>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-4">
+
+            <div class="col-sm-3">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">手机号码：</label>
+                    <label class="col-sm-4 control-label is-required">所属连锁：</label>
                     <div class="col-sm-8">
                         <div class="input-group">
-                            <input id="patientPhone" name="patientPhone" placeholder="请输入手机号码" class="form-control" type="number" maxlength="11" th:value="${patientPhone}">
-                            <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
+                            <input name="chainName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control" th:value="${chainName}">
+                            <span class="input-group-addon">
+                        <i class="fa fa-search"></i>
+                    </span>
                         </div>
                     </div>
                 </div>
             </div>
-
-            <div class="col-sm-4">
+            <div class="col-sm-3">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">药品通用名：</label>
+                    <label class="col-sm-4 control-label is-required">所属门店：</label>
                     <div class="col-sm-8">
-                        <input name="genericName" placeholder="请输入药品通用名" class="form-control" type="text" maxlength="30" th:value="${genericName}">
+                        <select name="storeName" class="form-control" th:with="type=${@dict.getType('sys_select_store')}">
+                            <option value="">请选择</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${storeName}"
+                            ></option>
+                        </select>
                     </div>
                 </div>
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-4">
+            <div class="col-sm-3">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">门店：</label>
-                    <div class="col-sm-8">
-                        <div class="input-group">
-                            <input name="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control"  th:value="${storeName}">
-                            <span class="input-group-addon"><i class="fa fa-search"></i></span>
-                        </div>
+                    <label class="col-sm-6 control-label">是否线上签收：</label>
+                    <div class="col-sm-4">
+                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictLabel}==${prescriptionType}"
+                            ></option>
+                        </select>
                     </div>
                 </div>
             </div>
 
-            <div class="col-sm-4">
+            <div class="col-sm-3">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">厂家：</label>
-                    <div class="col-sm-8">
-                        <input id="manufacturer" name="manufacturer" placeholder="请输入厂家" class="form-control" type="text" maxlength="30" th:value="${manufacturer}">
+                    <label class="col-sm-4 control-label">配送状态：</label>
+                    <div class="col-sm-4">
+                        <select name="deliveryStatus"  class="form-control"  th:with="type=${@dict.getType('sys_select_pszt')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${deliveryStatus}"></option>
+                        </select>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-4">
+            <div class="col-sm-3">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">登记人：</label>
-                    <div class="col-sm-8">
-
-                        <input id="registrar" name="registrar" placeholder="请输入登记人" class="form-control" type="text" maxlength="30" th:value="${registrar}">
+                    <label class="col-sm-4 control-label">冷链类型：</label>
+                    <div class="col-sm-4">
+                        <select name="coldChainType"  class="form-control"  th:with="type=${@dict.getType('sys_select_cold_type')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${coldChainType}"
+                            ></option>
+                        </select>
                     </div>
-
                 </div>
             </div>
+            <div class="col-sm-3">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">订单来源：</label>
+                    <div class="col-sm-4">
+                        <select name="orderSource"  class="form-control"  th:with="type=${@dict.getType('sys_select_order_sources')}">
+                            <option value="">全部</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${orderSource}"
+                            ></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
         </div>
         <div class="row">
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">规格：</label>
+                    <label class="col-sm-4 control-label">收货人：</label>
                     <div class="col-sm-8">
-                        <select name="specification" class="form-control" th:with="type=${@dict.getType('sys_select_specification')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                    th:selected="${dict.dictValue}==${specification}"></option>
-                        </select>
+                        <input id="recipientName" name="recipientName"  type="text" maxlength="100"  class="form-control" placeholder="请输入收货人" th:value="${recipientName}">
                     </div>
                 </div>
             </div>
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">数量：</label>
+                    <label class="col-sm-4 control-label">收货电话：</label>
                     <div class="col-sm-8">
-                        <input id="quantity" name="quantity" placeholder="请输入数量" class="form-control" type="number" maxlength="30" th:value="${quantity}">
+                        <input id="recipientPhone" name="recipientPhone"  type="number" maxlength="11"  class="form-control" placeholder="请输入收货电话" th:value="${recipientPhone}">
                     </div>
                 </div>
             </div>
+
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">商品名：</label>
+                    <label class="col-sm-4 control-label">冰排编号：</label>
+
                     <div class="col-sm-8">
-                        <input id="productName" name="productName"  type="text" maxlength="100"  class="form-control" placeholder="请输入商品名" th:value="${productName}">
+                        <input id="icePackNumber" name="icePackNumber" placeholder="请输入冰排编号" class="form-control" type="text" maxlength="50" th:value="${icePackNumber}">
                     </div>
                 </div>
             </div>
-        </div>
 
+
+        </div>
         <div class="row">
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">处方类型：</label>
+                    <label class="col-sm-4 control-label">收货地址：</label>
                     <div class="col-sm-8">
-                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_select_prescription_ype')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                    th:selected="${dict.dictValue}==${prescriptionType}"></option>
-                        </select>
+                        <input id="recipientAddress" name="recipientAddress"  type="text" maxlength="1000"  class="form-control" placeholder="请输入收货地址" th:value="${recipientAddress}">
                     </div>
                 </div>
             </div>
-
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">配送方式：</label>
+                    <label class="col-sm-4 control-label">出发温度：</label>
                     <div class="col-sm-8">
-                        <select name="deliveryMethod" class="form-control" th:with="type=${@dict.getType('sys_select_delivery_method')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                    th:selected="${dict.dictValue}==${deliveryMethod}"></option>
-                        </select>
+                        <input id="departureTemperature" name="departureTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入出发温度" th:value="${departureTemperature}">
                     </div>
                 </div>
             </div>
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">MDM编码：</label>
-
+                    <label class="col-sm-4 control-label">送达温度：</label>
                     <div class="col-sm-8">
-                        <input id="mdmCode" name="mdmCode" placeholder="请输入MDM编码" class="form-control" type="text" maxlength="50" th:value="${mdmCode}" >
+                        <input id="arrivalTemperature" name="arrivalTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入送达温度" th:value="${arrivalTemperature}">
                     </div>
                 </div>
             </div>
-
-
         </div>
         <div class="row">
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">医生：</label>
+                    <label class="col-sm-4 control-label">签收照片：</label>
                     <div class="col-sm-8">
-                        <input id="doctor" name="doctor" placeholder="请输入医生" class="form-control" type="text" maxlength="30" th:value="${doctor}">
+                        <input id="signaturePhoto" name="signaturePhoto"  type="text" maxlength="1000"  class="form-control" placeholder="签收照片" th:value="${signaturePhoto}">
                     </div>
                 </div>
             </div>
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">医院：</label>
+                    <label class="col-sm-4 control-label">配送员：</label>
                     <div class="col-sm-8">
-                        <input name="hospital" placeholder="请输入医院" class="form-control" type="text" maxlength="30" th:value="${hospital}">
+                        <input id="deliveryPerson" name="deliveryPerson" placeholder="请输入配送员" class="form-control" type="text" maxlength="50"  th:value="${deliveryPerson}">
                     </div>
                 </div>
             </div>
+
+
             <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label ">科室：</label>
+                    <label class="col-sm-4 control-label">配送箱编号：</label>
                     <div class="col-sm-8">
-                        <input id="department" name="department" placeholder="请输入科室" class="form-control" type="text" maxlength="50" th:value="${department}">
+                        <input id="deliveryBoxNumber" name="deliveryBoxNumber"  type="text" maxlength="25"  class="form-control" placeholder="配送箱编号" th:value="${deliveryBoxNumber}">
                     </div>
                 </div>
             </div>
         </div>
-
-
         <h4 class="form-header h4">其他信息</h4>
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-6 control-label">pos会员姓名：</label>
+                    <label class="col-sm-4 control-label">付款顺序：</label>
                     <div class="col-sm-8">
-                        <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" th:value="${posMemberName}">
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-6 control-label">pos会员手机号：</label>
-                    <div class="col-sm-8">
-                        <input id="posMemberPhone" name="posMemberPhone" placeholder="请输入pos会员手机号" class="form-control" type="number" maxlength="11" th:value="${posMemberPhone}">
+                        <select name="paymentSequence" class="form-control" th:with="type=${@dict.getType('sys_select_payment_sequence')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${paymentSequence}"
+                            ></option>
+                        </select>
                     </div>
                 </div>
             </div>
-
         </div>
     </form>
 </div>
@@ -221,7 +235,7 @@
 
 
     function submitHandler() {
-        var prefix = ctx + "dtp/recipe";
+        var prefix = ctx + "dtp/cold";
         if ($.validate.form()) {
             var data = $("#form-server-edit").serializeArray();
             /*var status = $("input[id='status']").is(':checked') == true ? 0 : 1;

health-admin/src/main/resources/templates/dtp/print/detail.html

@@ -35,15 +35,28 @@
 
 		<div class="form-group" th:style="'display:' + ${status == 0 ? 'none' : 'block'}">
 			<label class="col-sm-2 control-label">订单数据：</label>
-			<div class="form-control-static" th:text="${orderData}">
+			<div class="form-control-static" th:text="${orderData}" id="operParams">
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="col-sm-2 control-label">订单数据：</label>
+			<div class="form-control-static"><pre id="operParam"></pre></div>
+		</div>
 	</form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: jsonview-js" />
     <script th:inline="javascript">
+		$(function() {
+			debugger
+			var operParam = [[${oorderData}]];
+			if ($.common.isNotEmpty(operParam) && operParam.length < 2000) {
+				$("#operParam").JSONView(operParam);
+			} else {
+				$("#operParam").text(operParam);
+			}
 
+		});
     </script>
 </body>
 </html>

health-admin/src/main/resources/templates/dtp/recipe/add.html

@@ -170,22 +170,27 @@
 
         <h4 class="form-header h4">其他信息</h4>
         <div class="row">
-            <div class="col-sm-6">
+            <div class="col-sm-4">
                 <div class="form-group">
                     <label class="col-sm-6 control-label">pos会员姓名：</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-6">
                             <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" >
                     </div>
                 </div>
             </div>
-                <div class="col-sm-6">
+                <div class="col-sm-4">
                     <div class="form-group">
                         <label class="col-sm-6 control-label">pos会员手机号：</label>
-                            <div class="col-sm-8">
+                            <div class="col-sm-6">
                                 <input id="posMemberPhone" name="posMemberPhone" placeholder="请输入pos会员手机号" class="form-control" type="number" maxlength="11" >
                             </div>
                         </div>
                 </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+
+                </div>
+            </div>
 
         </div>
 
@@ -204,54 +209,6 @@
 <th:block th:include="include :: select2-js" />
 <script>
     var prefix = ctx + "dtp/recipe";
-    var prescriptionTypes = [
-        { label: '电子处方', value: 'electronic' },
-        { label: '纸质处方', value: 'paper' }
-    ];
-    // $("#form-user-add").validate({
-    //     onkeyup: false,
-    //     rules:{
-    //         patientName:{
-    //             minlength: 3,
-    //             maxlength: 20,
-    //             remote: {
-    //                 url: prefix + "/checkPatientNameAndPhoneUnique",
-    //                 type: "post",
-    //                 dataType: "json",
-    //                 data: {
-    //                     "patientName": function() {
-    //                         return $.common.trim($("#patientName").val());
-    //                     },
-    //                     "patientPhone": function() {
-    //                         return $.common.trim($("#patientPhone").val());
-    //                     }
-    //                 }
-    //             }
-    //         },
-    //         patientPhone:{
-    //             isPhone:true,
-    //             remote: {
-    //                 url: prefix + "/checkPhoneUnique",
-    //                 type: "post",
-    //                 dataType: "json",
-    //                 data: {
-    //                     "patientPhone": function () {
-    //                         return $.common.trim($("#patientPhone").val());
-    //                     }
-    //                 }
-    //             }
-    //         },
-    //     },
-    //     messages: {
-    //         "patientName": {
-    //             remote: "患者已经存在"
-    //         },
-    //         "patientPhone":{
-    //             remote: "患者手机号码已经存在"
-    //         }
-    //     },
-    //     focusCleanup: true
-    // });
 
     function submitHandler() {
         if ($.validate.form()) {
@@ -282,14 +239,10 @@
         $.modal.close(index);
     }
 
-    $(function() {
-        $('#post').select2({
-            placeholder: "请选择岗位",
-            allowClear: true
-        });
-    })
 </script>
 </body>
 </html>
 
 
+
+

health-admin/src/main/resources/templates/dtp/recipe/edit.html

@@ -166,23 +166,27 @@
 
             <h4 class="form-header h4">其他信息</h4>
             <div class="row">
-                <div class="col-sm-6">
+                <div class="col-sm-4">
                     <div class="form-group">
                         <label class="col-sm-6 control-label">pos会员姓名：</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-6">
                             <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" th:value="${posMemberName}">
                         </div>
                     </div>
                 </div>
-                <div class="col-sm-6">
+                <div class="col-sm-4">
                     <div class="form-group">
                         <label class="col-sm-6 control-label">pos会员手机号：</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-6">
                             <input id="posMemberPhone" name="posMemberPhone" placeholder="请输入pos会员手机号" class="form-control" type="number" maxlength="11" th:value="${posMemberPhone}">
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-4">
+                    <div class="form-group">
 
+                    </div>
+                </div>
             </div>
         </form>
     </div>

health-admin/src/main/resources/templates/dtp/recipe/recipe.html

@@ -17,25 +17,25 @@
 						<div class="select-list">
 							<ul>
 								<li>
-									患者信息：<input type="text"  placeholder="请输入患者姓名或手机号" name="query"/>
+									患者信息：<input type="text" class="styled-input" placeholder="请输入患者姓名或手机号" name="query"/>
 								</li>
 								<li>
-									药品：<input type="text" name="genericName"/>
+									药品：<input type="text" class="styled-input" name="genericName"/>
 								</li>
 								<li>
 								<li>
-									订单编号：<input type="text" name="orderId"/>
+									订单编号：<input type="text" class="styled-input" name="orderId"/>
 								</li>
 								<li>
-									销售单号：<input type="text" name="saleOrderNumber"/>
+									销售单号：<input type="text" class="styled-input" name="saleOrderNumber"/>
 								</li>：
 								</li>
 								<li>
-									处方单号：<input type="text" name="prescriptionNumber"/>
+									处方单号：<input type="text" class="styled-input" name="prescriptionNumber"/>
 								</li>
 								<li>
 									<label>处方类型</label>
-									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}">
+									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 												></option>
@@ -43,7 +43,7 @@
 								</li>
 								<li>
 									<label>配送方式</label>
-									<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}">
+									<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}" class="styled-input">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 												></option>
@@ -52,15 +52,15 @@
 
 								<li>
 									<label>订单日期 </label>
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
 									<span>-</span>
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
 								</li>
 
 
 								<li>
 									<label>订单状态</label>
-									<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}">
+									<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 										></option>
@@ -126,7 +126,6 @@
 	    		$('#scroll-up').toTop(opt);
 	    	}
 		    queryUserList();
-		    //queryDeptTree();
 		});
 
 		function queryUserList() {
@@ -165,7 +164,7 @@
 					},
 					{
 						field: "productName",
-						title: "商品名"
+						title: "商品名",
 					},
 					{
 						field: "specification",
@@ -272,7 +271,7 @@
 		            title: '操作',
 		            align: 'center',
 		            formatter: function(value, row, index) {
-		                if (row.id != 1) {
+		                if (row.id) {
 		                	var actions = [];
 			                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 			                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
@@ -302,22 +301,6 @@
 				$.table.search();
 			}
 		}
-
-		$('#btnExpand').click(function() {
-			$._tree.expandAll(true);
-		    $(this).hide();
-		    $('#btnCollapse').show();
-		});
-
-		$('#btnCollapse').click(function() {
-			$._tree.expandAll(false);
-		    $(this).hide();
-		    $('#btnExpand').show();
-		});
-
-		$('#btnRefresh').click(function() {
-			//queryDeptTree();
-		});
 		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 		function resetPre() {
 			resetDate();
@@ -327,35 +310,6 @@
 			$(".curSelectedNode").removeClass("curSelectedNode");
 			$.table.search();
 		}
-
-		/* 用户管理-部门 */
-		function dept() {
-			var url = ctx + "system/dept";
-			$.modal.openTab("部门管理", url);
-		}
-
-		/* 用户状态显示 */
-		function statusTools(row) {
-		    if (row.status == 1) {
-    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
-    		} else {
-    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
-    		}
-		}
-
-		/* 用户管理-停用 */
-		function disable(userId) {
-			$.modal.confirm("确认要停用用户吗？", function() {
-				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 1 });
-		    })
-		}
-
-		/* 用户管理启用 */
-		function enable(userId) {
-			$.modal.confirm("确认要启用用户吗？", function() {
-				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 0 });
-		    })
-		}
 	</script>
 </body>
 

health-admin/src/main/resources/templates/dtp/recipe/view.html

@@ -20,15 +20,14 @@
                 <div class="ant-card-head-title">
                     <div class="index_title-2CoZR">
                         <h1>DTP处方登记概览</h1>
-                        <button onclick="" class="ant-btn-primary">导出订单</button>
-                    </div>
+
                 </div>
             </div>
 
         </div>
         <div class="container-div">
         <form id="report-form">
-            <input type="text" class="" hidden="true" value="" name="id">
+            <input type="hidden"  class="form-control"  name="id" id="id">
         <div class="ChartAndTable_chart-and-table-3ib6R">
             <div class="ant-radio-group ant-radio-group-outline">
                 <label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked">
@@ -265,6 +264,9 @@
 
         /*门店列表-详细*/
         function detail(id) {
+            $("#id").val(id);
+            $.table.search();
+            $("#id").val("");
             debugger
             $.ajax({
                 type : "GET",
@@ -300,10 +302,12 @@
                         }]
                     };
 
+
+
                     // 使用新的数据更新图表
                     myChart.setOption(updatedOption);
-                    $("#id").val(id);
-                    queryUserList();
+
+
                 },
                 error : function(errorMsg) {
                     //请求失败时执行该函数
@@ -311,6 +315,7 @@
                     myChart.hideLoading();
                 }
             })
+
         }
 
     /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */

health-system/src/main/java/com/bzd/system/service/DTPService.java

@@ -198,4 +198,26 @@ public class DTPService {
     public Integer DelPrint(PageData pd) throws Exception {
         return daoSupport.delete("DTPMapper.DelPrint", pd);
     }
+
+
+
+    /**配置信息查询模块**/
+    /**
+     * 一店一目标签列表
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public List<PageData> findstoreTagList(final PageData pd) throws Exception {
+        return (List<PageData>) daoSupport.findForList("DTPMapper.StoreProductList", pd);
+    }
+    /**
+     * DTP医院列表
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public List<PageData> findHospitalList(final PageData pd) throws Exception {
+        return (List<PageData>) daoSupport.findForList("DTPMapper.HospitalList", pd);
+    }
 }

health-system/src/main/resources/mapper/system/DTPMapper.xml

@@ -439,4 +439,86 @@
             </if>
     </update>
 
+    <!--配置信息查询模块-->
+    <select id="StoreProductList" parameterType="pd" resultType="pd">
+        select
+        id,
+        createdBy,
+        createdDate,
+        storeId,
+        storeCode,
+        storeName,
+        mdmCode,
+        genericName,
+        productName,
+        manufacturer,
+        specification,
+        isPrescriptionItem,
+        isFlipItem,
+        isFollowUpItem,
+        isMandatoryRegistration,
+        isColdChainItem,
+        create_time as createTime,
+        updatedAt
+        from s_dtp_pzxx_store_product_list
+        <where>
+            <if test="id != null">AND id = #{id}</if>
+            <if test="createdBy != null and createdBy != ''">AND createdBy = #{createdBy}</if>
+            <if test="createdDate != null and createdDate != ''">AND createdDate = #{createdDate}</if>
+            <if test="storeId != null">AND storeId = #{storeId}</if>
+            <if test="storeCode != null and storeCode != ''">AND storeCode = #{storeCode}</if>
+            <if test="storeName != null and storeName != ''">AND storeName = #{storeName}</if>
+            <if test="mdmCode != null and mdmCode != ''">AND mdmCode = #{mdmCode}</if>
+            <if test="genericName != null and genericName != ''">AND genericName = #{genericName}</if>
+            <if test="productName != null and productName != ''">AND productName = #{productName}</if>
+            <if test="manufacturer != null and manufacturer != ''">AND manufacturer = #{manufacturer}</if>
+            <if test="specification != null and specification != ''">AND specification = #{specification}</if>
+            <if test="isPrescriptionItem != null">AND isPrescriptionItem = #{isPrescriptionItem}</if>
+            <if test="isFlipItem != null">AND isFlipItem = #{isFlipItem}</if>
+            <if test="isFollowUpItem != null">AND isFollowUpItem = #{isFollowUpItem}</if>
+            <if test="isMandatoryRegistration != null">AND isMandatoryRegistration = #{isMandatoryRegistration}</if>
+            <if test="isColdChainItem != null">AND isColdChainItem = #{isColdChainItem}</if>
+            <if test="create_time_start != null and create_time_start != '' and create_time_end != null and create_time_end != ''">
+                AND create_time BETWEEN #{create_time_start} AND #{create_time_end}
+            </if>
+            <if test="updatedAt_start != null and updatedAt_start != '' and updatedAt_end != null and updatedAt_end != ''">
+                AND updatedAt BETWEEN #{updatedAt_start} AND #{updatedAt_end}
+            </if>
+            <if test="query != null and query != ''">
+                AND (genericName LIKE CONCAT('%', #{query}, '%') OR productName LIKE CONCAT('%', #{query}, '%'))
+            </if>
+            AND del_flag = '0'
+        </where>
+        order by create_time desc
+    </select>
+    <select id="HospitalList" parameterType="pd" resultType="pd">
+        select
+        id,
+        createdBy,
+        standardName,
+        address,
+        phone,
+        create_time as createTime,
+        updated_time as updatedTime
+        from s_dtp_pzxx_hospital_list
+        <where>
+            <if test="id != null and id != ''">AND id = #{id}</if>
+            <if test="createdBy != null and createdBy != ''">AND createdBy = #{createdBy}</if>
+            <if test="standardName != null and standardName != ''">AND standardName  LIKE CONCAT('%', #{standardName}, '%')) </if>
+            <if test="address != null and address != ''">AND address = #{address}</if>
+            <if test="phone != null and phone != ''">AND phone = #{phone}</if>
+            <if test="create_time_start != null and create_time_start != '' and create_time_end != null and create_time_end != ''">
+                AND create_time BETWEEN #{create_time_start} AND #{create_time_end}
+            </if>
+            <if test="updated_time_start != null and updated_time_start != '' and updated_time_end != null and updated_time_end != ''">
+                AND updated_time BETWEEN #{updated_time_start} AND #{updated_time_end}
+            </if>
+            <if test="query != null and query != ''">
+                AND (standardName LIKE CONCAT('%', #{query}, '%') OR address LIKE CONCAT('%', #{query}, '%'))
+            </if>
+            AND del_flag = '0'
+        </where>
+        order by create_time desc
+    </select>
+
 </mapper>