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 + '';
- html = html + '';
- }else {
//有退回给医生的缺陷
- if(redFlagDoc!= 0){
+ if(redFlagDoc!= 0 && redFlagDoc!= null){
html = html + '';
- }
+ }
//有退回给护士的缺陷
- if(redFlagNur!= 0 ){
- html = html + '';
- }
+ if(redFlagNur!= 0 && redFlagNur!= null){
+ html = html + '';
}
}
}
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 + '';
}
//有退回给护士的缺陷
- if (redFlagNur != 0) {
+ if (redFlagNur != 0 && redFlagNur != null) {
html = html + '';
}
}
@@ -3781,7 +3781,6 @@
html += '';
}
}
-
return html;
},
events: {