From d096953776519f10cf99e73b9d019a3c4aa5cabe Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Wed, 24 Mar 2021 19:07:50 +0800
Subject: [PATCH] 1、完善哈希表后缀生成方法 2、增加哈希表后缀生成工具类(只传入字符串参数,其他参数用方法中的默认值)

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html |   91 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index 7c34ac0..4246731 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -1,4 +1,4 @@
-<form id="hospital-form" lay-filter="hospital-form" class="layui-form model-form" method="POST">
+<form id="hospital-form" lay-filter="hospital-form" autocomplete="off" class="layui-form model-form" method="POST">
     <div class="layui-form-item">
         <div class="layui-row">
             <div class="layui-col-sm7">
@@ -22,7 +22,7 @@
             <div class="layui-col-sm5">
                 <label class="layui-form-label">医院联系人</label>
                 <div class="layui-input-block">
-                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;"/>
                 </div>
             </div>
             <div class="layui-col-sm5">
@@ -40,7 +40,8 @@
                 <div class="layui-input-block">
                     <input name="departmentName" id="departmentName" placeholder="科室名称" type="text" class="layui-input"
                         maxlength="20" lay-verify="required" required style="width: 175px;" />
-                    &emsp;</div>
+                    &emsp;
+                </div>
             </div>
             <div class="layui-col-sm3">
                 <label class="layui-form-label">科室电话</label>
@@ -51,7 +52,46 @@
             <div class="layui-col-sm3">
                 <label class="layui-form-label">科室联系人</label>
                 <div class="layui-input-block">
-                    <input name="departmentLink" id="departmentLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+                    <input name="departmentLink" id="departmentLink" type="text" class="layui-input" maxlength="20"
+                        style="width: 200px;" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-row">
+            <div class="layui-col-sm4">
+                <label class="layui-form-label" style="width: 100px;">是否筛查科室</label>
+                <div class="layui-input-block">
+                    <input type="radio" name="isScreen" value="1" title="是">
+                    <input type="radio" name="isScreen" value="0" title="否" >
+                    &emsp;
+                </div>
+            </div>
+            <div class="layui-col-sm6">
+                <label class="layui-form-label">是否新筛查</label>
+                <div class="layui-input-block">
+                    <input type="radio" name="isNewScreenclient" value="1" title="是">
+                    <input type="radio" name="isNewScreenclient" value="0" title="否" >
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-row">
+            <div class="layui-col-sm4">
+                <label class="layui-form-label">是否私有云</label>
+                <div class="layui-input-block">
+                    <input type="radio" name="isPrivate" value="1" title="是">
+                    <input type="radio" name="isPrivate" value="0" title="否" >
+                    &emsp;
+                </div>
+            </div>
+            <div class="layui-col-sm8">
+                <label class="layui-form-label" style="width: 150px;">私有云服务器GUUID</label>
+                <div class="layui-input-block" >
+                    <input name="privateServerGuuid" id="privateServerGuuid" type="text" class="layui-input" maxlength="50"
+                           style="width: 300px;" />
                 </div>
             </div>
         </div>
@@ -94,12 +134,14 @@
                 <div class="layui-col-sm4">
                     <select lay-verify="required" required id="hospitalProvince" placeholder="省份"
                         lay-filter="hospitalProvince" style="width: 400px;">
-                    </select></div>
+                    </select>
+                </div>
                 <div class="layui-col-sm4">
                     <select id="hospitalCity" lay-verify="required" required placeholder="市" lay-filter="hospitalCity"
                         style="width: 350px;">
                         <option value="">选择市</option>
-                    </select></div>
+                    </select>
+                </div>
                 <div class="layui-col-sm4">
                     <select id="hospitalArea" lay-verify="required" required placeholder="区县" lay-filter="hospitalArea"
                         style="width: 350px;">
@@ -249,8 +291,8 @@
                     if (data.data.length > 0) {
                         $.each(data.data, function (index, item) {
                             //往下拉菜单里添加元素
-                                $('#saleUserName').append(new Option(item.nickname, item.id,
-                                    false, (!strUtil.isEmpty(selectVal) && selectVal == item.id)));
+                            $('#saleUserName').append(new Option(item.nickname, item.id,
+                                false, (!strUtil.isEmpty(selectVal) && selectVal == item.id)));
                         });
 
                         if (hosIdForEdit == "") {
@@ -278,12 +320,12 @@
         var hosIdForEdit = "";
         var departmentId = "";
         //当前登录人员的id
-        var selectVal="";
+        var selectVal = "";
         if (edithospitalData != null) {
             hosIdForEdit = edithospitalData.hospitalId;
             departmentId = edithospitalData.departmentId;
         }
-        else{
+        else {
             //先拿到当前登录用户的信息
             var nowUser = config.getUser();
             if (!strUtil.isEmpty(nowUser)) {
@@ -343,7 +385,11 @@
                     "#hospitalCity option:selected").text() : "";
                 data.field.hospitalArea = $("#hospitalArea option:selected").text() != "选择区县" ? $(
                     "#hospitalArea option:selected").text() : "";
-
+                let isScreen = data.field.isScreen
+                let isNewScreenclient = data.field.isNewScreenclient
+                delete data.field.isScreen
+                delete data.field.isNewScreenclient
+                let isPrivate = data.field.isPrivate
                 admin.req('api-user/syshospital', JSON.stringify(data.field), function (data) {
                     if (data.code === 0) {
                         //存储科室数据
@@ -362,8 +408,12 @@
                             accountsCount: $("#accountsCount").val(),
                             departmentTel: $("#departmentTel").val(),
                             departmentLink: $("#departmentLink").val(),
+                            isScreen,
+                            isNewScreenclient,
+                            isPrivate,
+                            privateServerGuuid: $("#privateServerGuuid").val(),
                         };
-                        admin.req('api-user/sysdepartment/'+data.data.id, JSON.stringify(departmentData),
+                        admin.req('api-user/sysdepartment/' + data.data.id, JSON.stringify(departmentData),
                             function (data) {
                                 layer.closeAll('loading');
                                 if (data.code == 0) {
@@ -476,20 +526,23 @@
                                         }
 
                                         $("#serverUserId").val(departData[0].serverUserId);
-                                        $('#serverUserName').val(departData[0]
-                                            .serverUserId);
+                                        $('#serverUserName').val(departData[0].serverUserId);
 
-                                        $("#departmentName").val(departData[0]
-                                            .departmentName);
+                                        $("#departmentName").val(departData[0].departmentName);
                                         $("#departmentId").val(departData[0].id);
                                         $("#departmentOrgId").val(departData[0].orgId);
                                         $("#saleUserId").val(departData[0].saleUserId);
-                                        $("#accountsCount").val(departData[0]
-                                            .accountsCount);
+                                        $("#accountsCount").val(departData[0].accountsCount);
                                         $('#saleUserName').val(departData[0].saleUserId);
                                         $('#departmentLink').val(departData[0].departmentLink);
                                         $('#departmentTel').val(departData[0].departmentTel);
-
+                                        $("input[name=isScreen][value=1]").attr("checked", departData[0].isScreen == 1 ? true : false);
+                                        $("input[name=isScreen][value=0]").attr("checked", departData[0].isScreen == null || departData[0].isScreen==0 ? true : false);
+                                        $("input[name=isNewScreenclient][value=1]").attr("checked", departData[0].isNewScreenclient == 1 ? true : false);
+                                        $("input[name=isNewScreenclient][value=0]").attr("checked", departData[0].isNewScreenclient == null || departData[0].isNewScreenclient==0? true : false);
+                                        $("input[name=isPrivate][value='1']").attr("checked", departData[0].isPrivate == 1 ? true : false);
+                                        $("input[name=isPrivate][value='0']").attr("checked", departData[0].isPrivate == null || departData[0].isPrivate==0 ? true : false);
+                                        $("#privateServerGuuid").val(departData[0].privateServerGuuid);
                                         if (hosIdForEdit != "") {
                                             $("#serverUserTel").val(departData[0]
                                                 .serverUserTel);

--
Gitblit v1.8.0