From e23e3f3b04b79e81bc784dcc22e71544d2e75c4a Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Tue, 18 Oct 2022 16:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E4=B8=BB=E4=BB=BB=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BB=E7=94=9F=E3=80=81=E6=8A=A4=E5=A3=AB?=
 =?UTF-8?q?=E3=80=81=E9=A6=96=E9=A1=B5=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/beHospitaledController.java    | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index 682bebb6..c5918db8 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -193,18 +193,19 @@ public class beHospitaledController {
         String result1="";
         String result2="";
         String result3="";
-        if (c1.compareTo(doctorTime)<0){
-            result1="①检查文书有过修改，麻烦医生在电子病历系统重新提交医生文书";
-        }
-        if (c2.compareTo(nurseTime)<0){
-            result2="②检查文书有过修改，麻烦护士在电子病历系统重新提交护士文书";
-        }
-        if (c9.compareTo(lastTime)<0){
-            result3="③检查首页有过修改，麻烦医生在电子病历系统重新提交首页";
-        }
-        if (result1!="" ||result2!="" ||result3!="" ){
-            result=result1+result2+result3;
-        }
+        if (doctorTime!=null || nurseTime!=null || lastTime!=null ) {
+            if (c1.compareTo(doctorTime) < 0) {
+                result1 = "①检查文书有过修改，麻烦医生在电子病历系统重新提交医生文书";
+            }
+            if (c2.compareTo(nurseTime) < 0) {
+                result2 = "②检查文书有过修改，麻烦护士在电子病历系统重新提交护士文书";
+            }
+            if (c9.compareTo(lastTime) < 0) {
+                result3 = "③检查首页有过修改，麻烦医生在电子病历系统重新提交首页";
+            }
+            if (result1 != "" || result2 != "" || result3 != "") {
+                result = result1 + result2 + result3;
+            }
          if (c1.compareTo(doctorTime)>=0 && c2.compareTo(nurseTime)>=0 && c9.compareTo(lastTime)>=0 ){
            if(flagNum==0) {
             try {
@@ -270,6 +271,20 @@ public class beHospitaledController {
             result = "提交失败,存在缺陷未处理!";
         }
         }
+        }else {
+            if (doctorTime==null) {
+                result1 = "①文书提交时间为空，麻烦医生在电子病历系统重新提交医生文书";
+            }
+            if (nurseTime==null) {
+                result2 = "②文书提交时间为空，麻烦护士在电子病历系统重新提交护士文书";
+            }
+            if (lastTime==null) {
+                result3 = "③首页提交时间为空，麻烦医生在电子病历系统重新提交首页";
+            }
+            if (result1 != "" || result2 != "" || result3 != "") {
+                result = result1 + result2 + result3;
+            }
+        }
         return result;
     }