wangsy пре 4 година
родитељ
комит
8480bafa00

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR0127.java

@@ -93,7 +93,7 @@ public class THR0127 extends QCCatalogue {
                     if (StringUtil.isBlank(dischargeTime)) {
                         dischargeTime = presentTime;
                     }
-                    Date sixDate = DateUtil.addDate(beginDate, 6);
+                    Date sixDate = DateUtil.addDate(beginDate, 7);
                     if (StringUtil.parseDateTime(dischargeTime).before(sixDate)) {
                         break;
                     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR0128.java

@@ -114,7 +114,7 @@ public class THR0128 extends QCCatalogue {
                     if (StringUtil.isBlank(dischargeTime)) {
                         dischargeTime = presentTime;
                     }
-                    Date sixDate = DateUtil.addDate(beginDate, 6);
+                    Date sixDate = DateUtil.addDate(beginDate, 7);
                     if (StringUtil.parseDateTime(dischargeTime).before(sixDate)) {
                         break;
                     }

+ 1 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR02931.java

@@ -32,12 +32,7 @@ public class THR02931 extends QCCatalogue {
             return;
         }
         String leaveDateStr = null;
-        Map<String, String> LeaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-        if (StringUtil.isNotBlank(LeaveHospitalStructureMap.get("出院日期"))) {
-            leaveDateStr = LeaveHospitalStructureMap.get("出院日期");
-        }
-
-        if (StringUtil.isBlank(leaveDateStr) && inputInfo.getMedicalRecordInfoDoc() != null) {
+        if (inputInfo.getMedicalRecordInfoDoc() != null) {
             Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
             leaveDateStr = medicalRecordInfoStructureMap.get("leaveHospitalDate");
         }