From 2cae9bd9d274133db724e0b71493cdf794437ebf Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Thu, 13 Jul 2023 15:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=A1=88=E5=B0=81=E5=AD=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/beHospitaledDir/beHospList.jsp    | 13 ++++---------
 .../webapp/WEB-INF/views/commitDir/commitList.jsp   |  1 -
 .../WEB-INF/views/lastVerifyDir/lastVerifyList.jsp  |  5 ++---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index a34f274f..d4efb83d 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -3883,18 +3883,13 @@
                                     var redFlagNur = row.faultNurseNum;
                                     //有缺陷
                                     if (redFlag != 0) {
-                                        if (redFlagDoc!= 0 && redFlagNur!= 0) {
-                                            html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
-                                            html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
-                                        }else {
                                             //有退回给医生的缺陷
-                                            if(redFlagDoc!= 0){
+                                        if(redFlagDoc!= 0 && redFlagDoc!= null){
                                                 html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
-                                            }
+                                        }
                                             //有退回给护士的缺陷
-                                            if(redFlagNur!= 0 ){
-                                                html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
-                                            }
+                                        if(redFlagNur!= 0 && redFlagNur!= null){
+                                            html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
                                         }
                                     }
                                 }
diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
index 900ad080..f5f5205d 100644
--- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
+++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
@@ -3637,7 +3637,6 @@
                         },
                         events: {
                             'click .backInfo': function (e, value, row, index) {
-
                                 if (row.id != null && row.id != "") {
                                     $.ajax({
                                         url: "${path}/beHosp/getMaster",
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index e93bfd95..1c50f7da 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -3764,11 +3764,11 @@
                                 var redFlagNur = row.faultNurseNum;
                                 if (redFlag != 0) {
                                     //有退回给医生的缺陷
-                                    if (redFlagDoc != 0) {
+                                    if (redFlagDoc != 0 && redFlagDoc != null) {
                                         html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
                                     }
                                     //有退回给护士的缺陷
-                                    if (redFlagNur != 0) {
+                                    if (redFlagNur != 0 && redFlagNur != null) {
                                         html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
                                     }
                                 }
@@ -3781,7 +3781,6 @@
                                     html += '<button type="button" class="btn btn-sm btn-warning signCancelInfo" style="visibility: hidden;">取消签收</button>';
                                 }
                             }
-
                             return html;
                         },
                         events: {