From 2415bce2892c6f8b295f4a4807699862d36b4713 Mon Sep 17 00:00:00 2001
From: wzqgit <568275241@qq.com>
Date: Thu, 15 Jul 2021 09:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=AD=BB=E4=BA=A1=E5=AD=97?=
=?UTF-8?q?=E6=A0=B7=E4=BF=AE=E6=94=B9=207/15=20wzq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp | 8 ++++----
src/main/webapp/WEB-INF/views/commitDir/commitList.jsp | 8 ++++----
.../webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp | 8 ++++----
.../views/medicalOverdueDir/medicalOverdueList.jsp | 6 +++---
.../WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp | 8 ++++----
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 04245b0c..c90caf7f 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -4383,17 +4383,17 @@
}
} else if (value == 0) {
if (redFlag == "0") {
- result = '未死亡';
+ result = '否';
} else {
//有缺陷显示红色
- result = '未死亡';
+ result = '否';
}
} else {
if (days > deathExpired) {
var day = days - deathExpired;
- result = '已死亡(超期' + day + ')';
+ result = '是(超期' + day + ')';
} else {
- result = '已死亡';
+ result = '是';
}
}
return result;
diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
index f56c576f..fd83d418 100644
--- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
+++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
@@ -3445,16 +3445,16 @@
var deathExpired = <%=res.getString("deathExpired")%>;
if (value != null && value != "" && value == 0) {
if (redFlag == 0) {
- result = ' ';
+ result = '否';
} else {
- result = ' ';
+ result = '否';
}
} else {
if (days > deathExpired) {
var day = days - deathExpired;
- result = '已死亡(超期' + day + ')';
+ result = '是(超期' + day + ')';
} else {
- result = '已死亡';
+ result = '是';
}
}
return result
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index d5ca8a65..64a998b7 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -3355,17 +3355,17 @@
var deathExpired = <%=res.getString("deathExpired")%>;
if (value != null && value != "" && value == 0) {
if (redFlag == 0) {
- result = ' ';
+ result = '否';
} else {
//有缺陷显示红色
- result = '';
+ result = '否';
}
} else {
if (days > deathExpired) {
var day = days - deathExpired;
- result = '已死亡';
+ result = '是';
} else {
- result = '已死亡';
+ result = '是';
}
}
return result
diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
index 654819d5..615b78db 100644
--- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
@@ -1925,13 +1925,13 @@
//死亡否
var deathExpired = <%=res.getString("deathExpired")%>;
if (value != null && value != "" && value == 0) {
- result = ' '
+ result = '否'
} else {
if (days > deathExpired) {
var day = days - deathExpired;
- result = '已死亡';
+ result = '是';
} else {
- result = '已死亡';
+ result = '是';
}
}
return result
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
index b9010f47..79b4ae3f 100644
--- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
+++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
@@ -3302,17 +3302,17 @@
}
} else if (value == 0) {
if (redFlag == "0") {
- result = '未死亡';
+ result = '否';
} else {
//有缺陷显示红色
- result = '未死亡';
+ result = '否';
}
} else {
if (days > deathExpired) {
var day = days - deathExpired;
- result = '已死亡(超期' + day + ')';
+ result = '是(超期' + day + ')';
} else {
- result = '已死亡';
+ result = '是';
}
}
return result;