义乌主治/主任未在48/72h内查房修改入院日期取值

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

@@ -31,10 +31,13 @@ public class THR0125 extends QCCatalogue {
             status.set("0");
             return;
         }
-        if (inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
-            Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String admisTime = leaveHospitalStructureMap.get("入院日期");
-            String dischargeTime = leaveHospitalStructureMap.get("出院日期");
+        String admisTime = null, dischargeTime = null;
+        if (inputInfo.getLeaveHospitalDoc() != null) {
+            if (inputInfo.getMedicalRecordInfoDoc() != null) {
+                Map<String, String> structureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
+                admisTime = structureMap.get("behospitalDate");
+                dischargeTime = structureMap.get("leaveHospitalDate");
+            }
             if (CatalogueUtil.isEmpty(admisTime)) {
                 status.set("0");
                 return;
@@ -48,7 +51,7 @@ public class THR0125 extends QCCatalogue {
         }
         if (inputInfo.getBeHospitalizedDoc() != null) {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            String admisTime = beHospitalStructureMap.get("入院日期");
+            admisTime = beHospitalStructureMap.get("入院日期");
             if (CatalogueUtil.isEmpty(admisTime)) {
                 status.set("0");
                 return;
@@ -56,7 +59,7 @@ public class THR0125 extends QCCatalogue {
             if (!CatalogueUtil.compareTime(
                     StringUtil.parseDateTime(admisTime),
                     StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(72 * 60))) {//如果入院未超过72小时，规则不判断
+                    72 * 60L)) {//如果入院未超过72小时，规则不判断
                 status.set("0");
                 return;
             }
@@ -126,12 +129,10 @@ public class THR0125 extends QCCatalogue {
         if (StringUtil.isNotBlank(titlePathography)) {
             if (titlePathography.contains("主任")) {
                 status.set("0");
-                return;
             } else if (StringUtil.isNotBlank(operatorName) && (titlePathography.contains(operatorName) || titlePathography.contains("主刀"))) {
                 String operationProfessor = getCourseProfessor(operatorName);
                 if (operationProfessor.contains("主任")) {
                     status.set("0");
-                    return;
                 }
             }
         }

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

@@ -34,9 +34,15 @@ public class THR0126 extends QCCatalogue {
         }
         String admisTime = null, dischargeTime = null;
         if (inputInfo.getLeaveHospitalDoc() != null && inputInfo.getThreeLevelWardDocs().size() > 0) {
+            if (inputInfo.getBeHospitalizedDoc() != null) {
+                Map<String, String> beStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+                admisTime = beStructureMap.get("入院日期");
+            }
             if (inputInfo.getMedicalRecordInfoDoc() != null) {
                 Map<String, String> structureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
-                admisTime = structureMap.get("behospitalDate");
+                if (StringUtil.isBlank(admisTime)) {
+                    admisTime = structureMap.get("behospitalDate");
+                }
                 dischargeTime = structureMap.get("leaveHospitalDate");
             }
             if (CatalogueUtil.isEmpty(admisTime)) {
@@ -144,7 +150,7 @@ public class THR0126 extends QCCatalogue {
 
     private String getFirstCourseProfessor(String doctorSign) {
         String professor = "";
-//        String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");
+        //        String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");
         if (StringUtil.isBlank(doctorSign)) {
             return professor;
         }