hujing il y a 5 ans
Parent
commit
10bcb5219b

+ 14 - 15
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0148.java

@@ -26,22 +26,21 @@ public class LEA0148 extends QCCatalogue {
             status.set("0");
             return;
         }
-        DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() != null) {
+        if (inputInfo.getDeathRecordDoc() != null || inputInfo.getDeathCaseDiscussDoc() != null) {
             status.set("0");
-        } else {
-            String timeQm = leaveHospitalDoc.getStructureMap().get("签名时间");
-            String timeCy = leaveHospitalDoc.getStructureMap().get("出院时间");
-            if (StringUtil.isNotBlank(timeQm) && StringUtil.isNotBlank(timeCy)) {
-                Date timeQmDate = StringUtil.parseDateTime(timeQm);
-                Date timeCyDate = StringUtil.parseDateTime(timeCy);
-                if (timeQmDate == null && timeCyDate == null) {
-                    status.set("0");
-                    return;
-                }
-                if (!CatalogueUtil.compareTime(timeCyDate, timeQmDate, 24 * 60L)) {
-                    status.set("0");
-                }
+            return;
+        }
+        String timeQm = leaveHospitalDoc.getStructureMap().get("签名时间");
+        String timeCy = leaveHospitalDoc.getStructureMap().get("出院时间");
+        if (StringUtil.isNotBlank(timeQm) && StringUtil.isNotBlank(timeCy)) {
+            Date timeQmDate = StringUtil.parseDateTime(timeQm);
+            Date timeCyDate = StringUtil.parseDateTime(timeCy);
+            if (timeQmDate == null && timeCyDate == null) {
+                status.set("0");
+                return;
+            }
+            if (!CatalogueUtil.compareTime(timeCyDate, timeQmDate, 24 * 60L)) {
+                status.set("0");
             }
         }
     }