厦门:规则优化

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/behospitalized/BEH0005.java

@@ -47,11 +47,10 @@ public class BEH0005 extends QCCatalogue {
                     }
                     for (String word : words) {
                         if (name.contains(word)) {
-                            timeIndex.add(chiefText.indexOf(word));
+                            timeIndex.add(chiefText.indexOf(name));
                             break;
                         }
                     }
-
                 }
             }
             if (timeIndex.size() > 0) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/operationdiscussion/OPE0369.java

@@ -54,12 +54,14 @@ public class OPE0369 extends QCCatalogue {
                 return;
             }
             String operationStartDate = "";
+            String operatorPhysician = "";
             List<Date> operDateList = new ArrayList<>();
             for (OperationDoc operationDoc : operationDocs) {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
                     String opeStartDate = operationDocStructureMap.get("手术日期");
                     String opeStartTime = operationDocStructureMap.get("开始时间");
+                    operatorPhysician = operationDocStructureMap.get("主刀医师");
                     if (StringUtil.isNotBlank(opeStartDate)) {
                         operationStartDate = opeStartDate;
                         if (StringUtil.isNotBlank(opeStartTime)) {
@@ -110,7 +112,9 @@ public class OPE0369 extends QCCatalogue {
                                 && StringUtil.parseDateTime(recordDateStr).before(date)) {
                             if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
                                     && ((makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
-                                    || (makeTitle.contains("术前") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
+                                    || (makeTitle.contains("术前") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前")))
+                                    || (StringUtil.isNotBlank(operatorPhysician) && makeTitle.contains(operatorPhysician))
+                            )) {
                                 operateCount++;
                             }
                         }

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

@@ -108,7 +108,8 @@ public class THR02900 extends QCCatalogue {
                 }
             }
             //查房标题中有主刀
-            if (allTitle.contains("主刀") || allTitle.contains("术后第一天")) {
+            if (allTitle.contains("主刀") || allTitle.contains("术后第一天") ||
+                    (StringUtil.isNotBlank(chiefSurgeon) && allTitle.contains(chiefSurgeon))) {
                 return;
             }
             //病情记录对比