From 96cd6921bcb39b321fa0b3b520551a4c287e7a7e Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 23 Nov 2020 16:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=95=B4=E8=BF=98?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=98=AF=E5=90=A6=E5=BC=BA=E5=88=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/beHospitaledDir/beHospList.jsp      |  2 +-
 .../webapp/static/js/beHospList/beHospList.js | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 7594c47..43b9a4d 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -831,7 +831,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-16"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-23_1"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-16"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js
index 18fd483..4188b27 100644
--- a/src/main/webapp/static/js/beHospList/beHospList.js
+++ b/src/main/webapp/static/js/beHospList/beHospList.js
@@ -83,37 +83,37 @@ function initTable() {
                 checkbox: true,
                 width: 25,
                 align: 'center',
-                valign: 'middle',
+                valign: 'middle'
             },
                 {
                     title: '住院号',
                     field: 'inpNo',
                     align: 'left',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '住院次数',
                     field: 'visitId',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '姓名',
                     field: 'name',
                     align: 'left',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '性别',
                     field: 'sex',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '出院科室',
                     field: 'deptName',
                     align: 'left',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '出院日期',
@@ -126,14 +126,14 @@ function initTable() {
                 {
                     title: '主管医生',
                     field: 'doctorInCharge',
-                    align: 'left',
+                    align: 'left'
                 },
                 {
                     title: '状态',
                     field: 'status',
                     align: 'center',
                     valign: 'middle',
-                    formatter:paramsMatter,
+                    formatter:paramsMatter
                 },
                 {
                     title: '是否完整',
@@ -469,10 +469,12 @@ $("#verifyBtn").on('click', function () {
         if(result != '完整'){
             result = "完整性未通过:"+result+";";
         }
-        $("#resultLabel1").text(result);
+        if(result != '完整'){
+            $("#resultLabel1").text(result);
+        }
         var c1s = selectC1WithNotCollectFinishByPatientId();
         $("#resultLabel2").text(c1s);
-        if (result != '' || c1s != '') {
+        if (result != '完整' || c1s != '') {
             $('#WZModal').modal({
                 backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
                 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。