嵊州：规则变动

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java

@@ -53,7 +53,7 @@ public class BEH0058 extends QCCatalogue {
             boolean flag = maritalText.matches(regex);
             regex = ".*\\d+-\\d+-\\d+-[1-9].*";
             boolean matches = maritalText.matches(regex);
-            regex = ".*\\d+，\\d+，\\d+，[1-9].*|.*\\d个.*|.*\\d男.*|.*\\d女.*";
+            regex = ".*\\d+，\\d+，\\d+，[1-9].*|.*\\d个.*|.*\\d男.*|.*\\d女.*|.*\\d子.*";
             boolean isComma = maritalText.matches(regex);
             if (flag || matches || isComma) {
                 status.set("0");

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

@@ -36,6 +36,8 @@ public class OPE0369 extends QCCatalogue {
 
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         String admisTime = "";
+        //主刀医师
+        List<String> chiefSurgeonList = new ArrayList<>();
         if (medicalRecordInfoDoc != null && medicalRecordInfoDoc.getStructureMap() != null) {
             //入院日期
             admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
@@ -65,6 +67,7 @@ public class OPE0369 extends QCCatalogue {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
                     operationStartDate = operationDocStructureMap.get("开始时间");
+                    String chiefSurgeon = operationDocStructureMap.get("主刀医师");
                     if (operationStartDate.contains("年月日")) {
                         continue;
                     }
@@ -76,6 +79,7 @@ public class OPE0369 extends QCCatalogue {
                             continue;
                         }
                         operDateList.add(StringUtil.parseDateTime(operationStartDate));
+                        chiefSurgeonList.add(chiefSurgeon);
                     } else {//取不到手术时间
                         return;
                     }
@@ -101,12 +105,15 @@ public class OPE0369 extends QCCatalogue {
                 String writTitle = structureMap.get("文书标题");
                 String recordDateStr = structureMap.get("查房日期");
                 if (operDateList.size() > 0) {
-                    for (Date date : operDateList) {
-                        if (StringUtil.isNotBlank(recordDateStr) && date != null
-                                && StringUtil.parseDateTime(recordDateStr).before(date)) {
-                            if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
+//                    for (Date date : operDateList) {
+                    for (int i = 0; i < operDateList.size(); i++) {
+                        if (StringUtil.isNotBlank(recordDateStr) && operDateList.get(i) != null
+                                && StringUtil.parseDateTime(recordDateStr).before(operDateList.get(i))) {
+                            if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), operDateList.get(i), Long.valueOf(24 * 60))
                                     && (((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
-                                    || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
+                                    || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前")))
+                                    || (StringUtil.isNotBlank(makeTitle) && StringUtil.isNotBlank(chiefSurgeonList.get(i)) && makeTitle.contains(chiefSurgeonList.get(i)))
+                                    || (StringUtil.isNotBlank(writTitle) && StringUtil.isNotBlank(chiefSurgeonList.get(i)) && writTitle.contains(chiefSurgeonList.get(i))))) {
                                 operateCount++;
                             }
                         }