主任主治医师首次查房逻辑更新

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0125.java

@@ -30,7 +30,7 @@ public class THR0125 extends QCCatalogue {
             String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
             //出院日期
             String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
-            if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
+            if (CatalogueUtil.isEmpty(admisTime)) {
                 status.set("0");
                 return;
             }
@@ -42,7 +42,7 @@ public class THR0125 extends QCCatalogue {
                 return;
             }
             //如果住院天数小于3天则不判断该条规则
-            if (DateUtil.parseDate(dischargeTime) != null &&
+            if (StringUtil.isNotBlank(dischargeTime) && DateUtil.parseDate(dischargeTime) != null &&
                     !CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (72 * 60))) {
                 status.set("0");
                 return;
@@ -56,17 +56,13 @@ public class THR0125 extends QCCatalogue {
 //        if (inputInfo.getBeHospitalizedDoc() != null) {
 //            Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
 //            String admisTime = beHospitalStructureMap.get("入院日期");
-            if (CatalogueUtil.isEmpty(admisTime)) {
-                status.set("0");
-                return;
-            }
-            if (!CatalogueUtil.compareTime(
-                    StringUtil.parseDateTime(admisTime),
-                    StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(72 * 60))) {//如果入院未超过72小时，规则不判断
-                status.set("0");
-                return;
-            }
+//            if (!CatalogueUtil.compareTime(
+//                    StringUtil.parseDateTime(admisTime),
+//                    StringUtil.parseDateTime(DateUtil.nowString()),
+//                    Long.valueOf(72 * 60))) {//如果入院未超过72小时，规则不判断
+//                status.set("0");
+//                return;
+//            }
             //开始时间(入院时间)
             Date beginDate = StringUtil.parseDateTime(admisTime);
             if (beginDate == null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0126.java

@@ -35,7 +35,7 @@ public class THR0126 extends QCCatalogue {
             String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
             //出院日期
             String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
-            if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
+            if (CatalogueUtil.isEmpty(admisTime)) {
                 status.set("0");
                 return;
             }
@@ -47,7 +47,7 @@ public class THR0126 extends QCCatalogue {
                 return;
             }
             //如果住院天数小于2天则不判断该条规则
-            if (DateUtil.parseDate(dischargeTime) != null && StringUtil.isNotEmpty(dischargeTime) &&
+            if (StringUtil.isNotBlank(dischargeTime) && DateUtil.parseDate(dischargeTime) != null && StringUtil.isNotEmpty(dischargeTime) &&
                     !CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (48 * 60))) {
                 status.set("0");
                 return;
@@ -61,17 +61,13 @@ public class THR0126 extends QCCatalogue {
 //        if (inputInfo.getBeHospitalizedDoc() != null) {
 //            Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
 //            String admisTime = beHospitalStructureMap.get("入院日期");
-            if (CatalogueUtil.isEmpty(admisTime)) {
-                status.set("0");
-                return;
-            }
-            if (!CatalogueUtil.compareTime(
-                    StringUtil.parseDateTime(admisTime),
-                    StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(48 * 60))) {//如果入院未超过48小时，规则不判断
-                status.set("0");
-                return;
-            }
+//            if (!CatalogueUtil.compareTime(
+//                    StringUtil.parseDateTime(admisTime),
+//                    StringUtil.parseDateTime(DateUtil.nowString()),
+//                    Long.valueOf(48 * 60))) {//如果入院未超过48小时，规则不判断
+//                status.set("0");
+//                return;
+//            }
             //开始时间(入院时间)
             Date beginDate = StringUtil.parseDateTime(admisTime);
             if (beginDate == null) {