北仑：术后24小时内无主刀或一助查房记录增加病情记录判断

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

@@ -36,6 +36,7 @@ public class THR02900 extends QCCatalogue {
             allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
         }
         String allTitle = "";
+        String allPathography = "";
         for (OperationDoc operationDoc : operationDocs) {
             OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
             if (operationRecordDoc == null) {
@@ -67,18 +68,22 @@ public class THR02900 extends QCCatalogue {
                     Map<String, String> wardStructureMap = wardDoc.getStructureMap();
                     String recordDateStr = wardStructureMap.get("查房日期");
                     String recordTitle = wardStructureMap.get("查房标题");
+                    String pathography = wardStructureMap.get("病情记录");
                     Date recordDate = CatalogueUtil.parseStringDate(recordDateStr);
-                    if (StringUtil.isBlank(recordTitle) || recordDate == null) {
+                    if (StringUtil.isBlank(recordTitle) || StringUtil.isBlank(pathography) || recordDate == null) {
                         continue;
                     }
                     if (opeEndDate.before(recordDate) && !CatalogueUtil.compareTime(opeEndDate, recordDate, 24 * 60L)) {
                         allTitle += recordTitle;
+                        allPathography += pathography;
                     }
                 }
             }
-            if (allTitle.contains("术后主刀")) {
+            //查房标题中有术后主刀
+            if (allTitle.contains("术后主刀") || allTitle.contains("术后第一天主刀")) {
                 return;
             }
+            //查房标题对比
             if (StringUtil.isNotBlank(chiefSurgeon) && !allTitle.contains(chiefSurgeon) &&
                     StringUtil.isNotBlank(firstAssistant) && !allTitle.contains(firstAssistant)) {
                 status.set("-1");
@@ -90,6 +95,11 @@ public class THR02900 extends QCCatalogue {
                     }
                 }
             }
+            //病情记录对比
+            if ((StringUtil.isNotBlank(chiefSurgeon) && allPathography.contains(chiefSurgeon)) ||
+                    (StringUtil.isNotBlank(firstAssistant) && allPathography.contains(firstAssistant))) {
+                return;
+            }
         }
     }
 }