优化入院登记功能

src/main/resources/static/js/jBox/common.js

@@ -550,10 +550,10 @@ function initProvince(type) {
                     size: 5
                 });
                 initCity(1, null);
-                $('#provinceUpdateHome').empty();   //清空resText里面的所有内容
-                $('#provinceUpdateHome').html(html);
-                $('#provinceUpdateHome').selectpicker('refresh');
-                $('#provinceUpdateHome').selectpicker({
+                $('#provinceCodeBorn').empty();   //清空resText里面的所有内容
+                $('#provinceCodeBorn').html(html);
+                $('#provinceCodeBorn').selectpicker('refresh');
+                $('#provinceCodeBorn').selectpicker({
                     dropuAuto: false,
                     size: 5
                 });
@@ -577,7 +577,7 @@ function initCity(type, defaultCode) {
     } else if (type == 3) {
         parentCode = $("#rapidAcceptsProvinceCode").val();
     }else if (type == 4){
-        parentCode = $("#provinceUpdateHome").val();
+        parentCode = $("#provinceCodeBorn").val();
     }
     $.ajax({
         type: "GET",
@@ -599,7 +599,7 @@ function initCity(type, defaultCode) {
             } else if (type == 3) {
                 id = 'rapidAcceptsCityCode';
             }else if (type == 4){
-                id = 'cityUpdateHome';
+                id = 'cityCodeBorn';
             }
             $('#' + id).empty();   //清空resText里面的所有内容
             $('#' + id).html(html);
@@ -632,7 +632,7 @@ function initDistrict(type, defaultCityCode, defaultCode) {
         } else if (type == 3) {
             defaultCityCode = $("#rapidAcceptsCityCode").val();
         } else if (type == 4) {
-            defaultCityCode = $("#cityUpdateHome").val();
+            defaultCityCode = $("#cityCodeBorn").val();
         }
     }
     $.ajax({
@@ -655,7 +655,7 @@ function initDistrict(type, defaultCityCode, defaultCode) {
             } else if (type == 3) {
                 id = 'rapidAcceptsDistrictCode';
             } else if (type == 4) {
-                id = 'countyUpdateHome';
+                id = 'districtCodeBorn';
             }
             $('#' + id).empty();   //清空resText里面的所有内容
             $('#' + id).html(html);

src/main/resources/static/js/zy/hospitalized.js

@@ -111,7 +111,7 @@ $(function () {
     $("#seeIdCard").on("click", function (t) {
         $.ajax({
             type: "GET",
-            url: '/thmz/getPatientMiSfzByPatientId?patientId='+$("#patientId").val(),
+            url: '/thmz/getPatientMiSfzByPatientId?patientId=' + $("#patientId").val(),
             contentType: "application/json;charset=UTF-8",
             dataType: "json",
             headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -121,8 +121,8 @@ $(function () {
                     return;
                 }
                 if (res.code == 0) {
-                 $("#seeIdCardModal").modal("show");
-                 $("#idCardImage").attr("src","data:image/jpeg;base64,"+res.data.sfzImage);
+                    $("#seeIdCardModal").modal("show");
+                    $("#idCardImage").attr("src", "data:image/jpeg;base64," + res.data.sfzImage);
                 } else {
                     errorMesage(res);
                 }
@@ -419,8 +419,8 @@ function queryUserInfoByCardNo() {
                             $("#saveUser").show();
                             $("#clearRegistration").show();
                         }
-                        $('#provinceUpdateHome').selectpicker('val', res.data.provinceCode);
-                        $('#provinceUpdateHome').selectpicker('refresh');
+                        $('#provinceCode').selectpicker('val', res.data.provinceCode);
+                        $('#provinceCode').selectpicker('refresh');
                         initCity(4, res.data.cityCode);
                         initDistrict(4, res.data.cityCode, res.data.districtCode);
 
@@ -469,13 +469,13 @@ function queryUserInfoByCardNo() {
                                     window.location.href = '/thmz/login/view'
                                     return;
                                 }
-                                if (resAp.code == 0) {
-                                    var birthPlace=resAp.data.birthPlace;
-                                    if(birthPlace!=null){
-                                        var provinceCode=birthPlace.slice(0,2)+"0000";
-                                        $("#provinceCode").selectpicker('val',provinceCode);
+                                if (resAp.code == 0 && resAp.data != null) {
+                                    var birthPlace = resAp.data.birthPlace;
+                                    if (birthPlace != null) {
+                                        var provinceCode = birthPlace.slice(0, 2) + "0000";
+                                        $("#provinceCode").selectpicker('val', provinceCode);
                                         $("#provinceCode").selectpicker('refresh');
-                                        var cityCode=birthPlace.slice(0,4)+"00";
+                                        var cityCode = birthPlace.slice(0, 4) + "00";
                                         initCity(1, cityCode);
                                         initDistrict(1, cityCode, birthPlace);
                                     }
@@ -500,13 +500,16 @@ function queryUserInfoByCardNo() {
                                     $("#idCard").blur();
                                     $("#admissionNumber").val(resAp.data.inpatientNo);
                                     //验证当前病人是不是在院病人
-                                    if(resAp.data.inpatientNo!=null && resAp.data.inpatientNo!=""){
+                                    if (resAp.data.inpatientNo != null && resAp.data.inpatientNo != "") {
                                         $.ajax({
                                             type: "GET",
                                             url: '/thmz/getCountByInpatientNo?inpatientNo=' + resAp.data.inpatientNo,
                                             contentType: "application/json;charset=UTF-8",
                                             dataType: "json",
-                                            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+                                            headers: {
+                                                'Accept': 'application/json',
+                                                'Authorization': 'Bearer ' + localStorage.getItem("token")
+                                            },
                                             success: function (res) {
                                                 if (res == '401' || res == 401) {
                                                     window.location.href = '/thmz/login/view'
@@ -668,7 +671,7 @@ function initListSelect() {
     initReqDoctorSelect()
     initCountrySelect();
     initNationSelect();
-   // initDistrictSelect();
+    // initDistrictSelect();
     initRelationSelect();
     initOccupationSelect();
     iniAdmissStatus();
@@ -993,6 +996,20 @@ function clearInput() {
     $("#admissStatus").val(null);
     $('#certificateType').selectpicker('val', '01');
     $('#certificateType').selectpicker('refresh');
+
+    $("#provinceCode").selectpicker('val', -1);
+    $('#provinceCode').selectpicker('destroy').selectpicker('refresh');
+    $("#cityCode").selectpicker('val', -1);
+    $('#cityCode').selectpicker('destroy').selectpicker('refresh');
+    $("#districtCode").selectpicker('val', -1);
+    $('#districtCode').selectpicker('destroy').selectpicker('refresh');
+
+    $("#provinceCodeBorn").selectpicker('val', -1);
+    $('#provinceCodeBorn').selectpicker('destroy').selectpicker('refresh');
+    $("#cityCodeBorn").selectpicker('val', -1);
+    $('#cityCodeBorn').selectpicker('destroy').selectpicker('refresh');
+    $("#districtCodeBorn").selectpicker('val', -1);
+    $('#districtCodeBorn').selectpicker('destroy').selectpicker('refresh');
 }
 
 
@@ -1102,7 +1119,7 @@ function saveZyPatient(flag) {
             "occupationCode": $("#profession").val(),
             "country": $("#nationality").val(),
             "nationCode": $("#nation").val(),
-            "birthPlace": $("#districtCode").val(),
+            "birthPlace": $("#districtCodeBorn").val(),
             "accountStreet": $("#permanentAddress").val(),
             "psnCertType": $("#certificateType").val(),
             "socialNo": $("#idCard").val(),
@@ -1114,9 +1131,9 @@ function saveZyPatient(flag) {
             "relationTel": $("#contractPhone").val(),
             "relationStreet": $("#contractAddress").val(),
             "inpatientNoType": getIndex("regi_List_btn_group"),
-            "provinceCode": $("#provinceUpdateHome").val(),
-            "cityCode": $("#cityUpdateHome").val(),
-            "districtCode": $("#countyUpdateHome").val()
+            "provinceCode": $("#provinceCode").val(),
+            "cityCode": $("#cityCode").val(),
+            "districtCode": $("#districtCode").val()
         }),
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {
@@ -1250,8 +1267,8 @@ function fillPatinet(patientId) {
                     $("#address").val(res.data.detail);
                     $("#address").blur();
                     $("#patientId").val(res.data.patientId);
-                    $('#provinceUpdateHome').selectpicker('val', res.data.provinceCode);
-                    $('#provinceUpdateHome').selectpicker('refresh');
+                    $('#provinceCode').selectpicker('val', res.data.provinceCode);
+                    $('#provinceCode').selectpicker('refresh');
                     initCity(4, res.data.cityCode);
                     initDistrict(4, res.data.cityCode, res.data.districtCode);
                     if (res.data.name != null && res.data.name != "") {
@@ -1413,3 +1430,19 @@ function siReadCard() {
     });
     // window.open('ReadCard://'+prm, '_self')
 }
+
+
+/**
+ * 复制地址
+ */
+function copyAddress() {
+    if (clipboard != null) {
+        clipboard.destroy();
+    }
+    clipboard = new ClipboardJS('#copyAddress', {
+        text: function (trigger) {
+            alert("复制成功！");
+            return trigger.getAttribute('data-clipboard-text');
+        }
+    });
+}

src/main/resources/templates/mz/registration.html

@@ -689,7 +689,7 @@
                             <div class="col-md-8 col-sm-8 col-xs-12">
                                 <div class="input-group demo2 input-group-own">
                                     <input id="editUserCardNo" class="form-control col-md-7 col-xs-12"
-                                           data-validate-length-range="1,8"
+                                           data-validate-length-range="1,10"
                                            placeholder="请输入" required="required" type="text">
                                     <span class="input-group-addon"><a href="#"><i
                                             class="fa fa-credit-card"></i></a></span>

src/main/resources/templates/zy/hospitalized.html

@@ -13,6 +13,7 @@
 <script src="/thmz/js/jBox/jquery.jBox-2.3.min.js"></script>
 <script src="/thmz/js/jBox/baseISSObject.js"></script>
 <script src="/thmz/js/jBox/baseISSOnline.js"></script>
+<script src="/thmz/js/dependent/clipboard.js"></script>
 <script src="/thmz/js/jBox/common.js"></script>
 <!--<script src="/thmz/js/common/distpicker.js"></script>-->
 <script src="/thmz/js/zy/hospitalized.js"></script>
@@ -62,6 +63,7 @@
                         <a id="updateInpatientNo"><i class="fa fa-check-square-o">&nbsp;修改住院号</i></a>
                         <a onclick="saveZyPatient(false)" id="saveUser" hidden><i
                                 class="fa fa-user">&nbsp;保存患者信息</i></a>
+                        <a id="copyAddress" hidden><i class="fa fa-copyright" onclick="copyAddress()">&nbsp;复制身份证地址</i></a>
                         <a id="clearRegistration"><i class="fa fa-trash">&nbsp;清空</i></a>
                     </div>
                 </div>
@@ -136,7 +138,7 @@
                     <div class="col-md-8 col-sm-8 col-xs-12">
                         <div class="input-group demo2 input-group-own">
                             <input id="cardNo" class="form-control col-md-7 col-xs-12" type="text"
-                                   data-validate-length-range="1,8"
+                                   data-validate-length-range="1,10"
                                    placeholder="ID/卡号" required="required">
                             <input type='text' class="form-control hide" id='patientId'/>
                             <span class="input-group-addon"><a href="#" style="cursor: default"><i
@@ -205,13 +207,13 @@
                     <!--</div>-->
                     <label class="col-sm-2 control-label" style="padding-left: 28px;padding-top: 10px">出生地址</label>
                     <div class="col-md-4 col-sm-4 col-xs-12">
-                        <select class="form-control selectpicker show-tick" id="provinceCode" onchange="initCity(1,null)" data-live-search="true"></select>
+                        <select class="form-control selectpicker show-tick" id="provinceCodeBorn" onchange="initCity(4,null)" data-live-search="true"></select>
                     </div>
                     <div class="col-md-3 col-sm-3 col-xs-12">
-                        <select class="form-control selectpicker show-tick" id="cityCode" onchange="initDistrict(1,null,null)" data-live-search="true"></select>
+                        <select class="form-control selectpicker show-tick" id="cityCodeBorn" onchange="initDistrict(4,null,null)" data-live-search="true"></select>
                     </div>
                     <div class="col-md-3 col-sm-3 col-xs-12">
-                        <select class="form-control selectpicker show-tick" id="districtCode" data-live-search="true"></select>
+                        <select class="form-control selectpicker show-tick" id="districtCodeBorn" data-live-search="true"></select>
                     </div>
                 </div>
             </div>
@@ -256,13 +258,13 @@
                 <div class="col-md-6 col-sm-6 col-xs-12 item" data-toggle="distpicker" data-autoselect="3">
                     <label class="col-sm-2 control-label" style="padding-left: 28px;padding-top: 10px">家庭住址</label>
                     <div class="col-md-4 col-sm-4 col-xs-12">
-                        <select class="form-control selectpicker show-tick" id="provinceUpdateHome" onchange="initCity(4,null)" data-live-search="true"></select>
+                        <select class="form-control selectpicker show-tick" id="provinceCode" onchange="initCity(1,null)" data-live-search="true"></select>
                     </div>
                     <div class="col-md-3 col-sm-3 col-xs-12">
-                        <select class="form-control selectpicker show-tick" id="cityUpdateHome" onchange="initDistrict(4,null,null)" data-live-search="true"></select>
+                        <select class="form-control selectpicker show-tick" id="cityCode" onchange="initDistrict(1,null,null)" data-live-search="true"></select>
                     </div>
                     <div class="col-md-3 col-sm-3 col-xs-12">
-                        <select class="form-control selectpicker show-tick" id="countyUpdateHome" data-live-search="true"></select>
+                        <select class="form-control selectpicker show-tick" id="districtCode" data-live-search="true"></select>
                     </div>
                 </div>
                 <div class="col-md-6 col-sm-6 col-xs-12 item">