Merge branch 'beilun/dev' of http://192.168.2.236:10080/louhr/qc into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0024.java

@@ -48,7 +48,8 @@ public class BEH0024 extends QCCatalogue {
         }
         //硬规则匹配
         String pastLabelText = pastLabel.getText();
-        if (pastLabelText.contains("外伤") || pastLabelText.contains("详见原病历") || pastLabelText.contains("骨折")) {
+        if (pastLabelText.contains("外伤") || pastLabelText.contains("详见原病历")
+                || pastLabelText.contains("见旧病历") || pastLabelText.contains("见既往病历") || pastLabelText.contains("骨折")) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0025.java

@@ -62,7 +62,7 @@ public class BEH0025 extends QCCatalogue {
         //规则硬匹配
         String pastLabelText = pastLabel.getText();
         if (pastLabelText.contains("手术") || pastLabelText.contains("详见原病历")
-                || pastLabelText.contains("体外碎石")) {
+                || pastLabelText.contains("见旧病历") || pastLabelText.contains("见既往病历")|| pastLabelText.contains("体外碎石")) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0026.java

@@ -39,7 +39,7 @@ public class BEH0026 extends QCCatalogue {
             return;
         }
         String pastText = pastLabel.getText();
-        if (pastText.contains("食物过敏史") || pastText.contains("详见原病历")) {
+        if (pastText.contains("食物过敏史") || pastText.contains("详见原病历")|| pastText.contains("见旧病历") || pastText.contains("见既往病历")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0028.java

@@ -39,7 +39,7 @@ public class BEH0028 extends QCCatalogue {
             return;
         }
         String pastText = pastLabel.getText();
-        if (pastText.contains("输血") || pastText.contains("详见原病历")) {
+        if (pastText.contains("输血") || pastText.contains("详见原病历")|| pastText.contains("见旧病历") || pastText.contains("见既往病历")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0029.java

@@ -48,7 +48,8 @@ public class BEH0029 extends QCCatalogue {
         }
         if (pastLabel != null) {
             String pastText = pastLabel.getText();
-            if (StringUtil.isNotBlank(pastText) && (pastText.contains("详见原病历") || pastText.contains("预防接种"))) {
+            if (StringUtil.isNotBlank(pastText) && (pastText.contains("详见原病历") || pastText.contains("预防接种")
+                    || pastText.contains("见旧病历") || pastText.contains("见既往病历"))) {
                 status.set("0");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0030.java

@@ -48,7 +48,7 @@ public class BEH0030 extends QCCatalogue {
         }
         String pastText = pastLabel.getText();
         if (pastText.contains("肝炎") || pastText.contains("结核") || pastText.contains("详见原病历")
-                || pastText.contains("乙肝")) {
+                || pastText.contains("见旧病历") || pastText.contains("见既往病历") || pastText.contains("乙肝")) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0031.java

@@ -52,7 +52,7 @@ public class BEH0031 extends QCCatalogue {
                         , "肺结核", "腹膜透析", "慢性阻塞性肺病", "精神分裂症", "分裂情感性精神病", "双相情感障碍，目前为缓解状态", "前列腺增生"
                         , "高脂血症", "高低密度脂蛋白胆固醇血症", "高胆固醇血症", "高甘油三酯血症", "骨质疏松", "慢性乙型病毒性肝炎"
                         , "慢性庚型肝炎", "慢性肝炎", "慢性丁型肝炎", "慢性病毒性肝炎", "慢性丙型病毒性肝炎", "酒精性肝病", "脂肪肝"
-                        , "肝硬化", "肝恶性肿瘤", "肝恶性细胞瘤", "肝病", "类风湿性关节炎", "心脑血管", "内分泌");
+                        , "肝硬化", "肝恶性肿瘤", "肝恶性细胞瘤", "肝病", "类风湿性关节炎", "心脑血管", "内分泌","见旧病历","见既往病历");
                 for (String word : words) {
                     if (text.contains(word)) {
                         status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0042.java

@@ -55,7 +55,7 @@ public class BEH0042 extends QCCatalogue {
                 status.set("0");
             }
         }
-        if (text.contains("出生")) {
+        if (text.contains("出生")|| text.contains("见旧病历") || text.contains("见既往病历")) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0043.java

@@ -43,7 +43,7 @@ public class BEH0043 extends QCCatalogue {
         }
         String text = personalLabel.getText();
         if (StringUtil.isBlank(text) || text.contains("居住") || text.contains("生长") || text.contains("生活")
-                || text.contains("详见原病历")) {
+                || text.contains("详见原病历")|| text.contains("见旧病历") || text.contains("见既往病历")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0047.java

@@ -36,7 +36,7 @@ public class BEH0047 extends QCCatalogue {
             return;
         }
         String pastText = personalLabel.getText();
-        if (pastText.contains("饮酒") || pastText.contains("详见原病历")) {
+        if (pastText.contains("饮酒") || pastText.contains("详见原病历")|| pastText.contains("见旧病历") || pastText.contains("见既往病历")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0053.java

@@ -47,7 +47,7 @@ public class BEH0053 extends QCCatalogue {
         String maritalText = maritalLabel.getText();
         if ("未婚".equals(marry) || maritalText.contains("未婚") || maritalText.contains("详见原病历")
                 || maritalText.contains("离婚") || maritalText.contains("离异") || maritalText.contains("适龄结婚")
-                || maritalText.contains("丧偶")) {
+                || maritalText.contains("丧偶")|| maritalText.contains("见旧病历") || maritalText.contains("见既往病历")) {
             status.set("0");
             return;
         }

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

@@ -67,7 +67,7 @@ public class BEH0058 extends QCCatalogue {
         }
         if (StringUtil.isNotBlank(maritalText)) {
             List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
-                    , "0-0-0-0", "详见原病历", "0－0－0－0");
+                    , "0-0-0-0", "详见原病历", "0－0－0－0","见旧病历","见既往病历");
             for (String word : words) {
                 if (maritalText.contains(word)) {
                     status.set("0");
@@ -86,7 +86,7 @@ public class BEH0058 extends QCCatalogue {
         if (ListUtil.isNotEmpty(familiesMl)) {
             familyList.addAll(familiesMl);
         }
-        Pattern p = Pattern.compile("[儿子女]");
+        Pattern p = Pattern.compile(".*[儿|子|女].*");
         if (StringUtil.isNotBlank(familyMembersHealth)) {
             if (p.matcher(familyMembersHealth).find()) {
                 status.set("0");
@@ -98,7 +98,6 @@ public class BEH0058 extends QCCatalogue {
                 .filter(
                         i -> i != null
                                 && StringUtil.isNotBlank(i.getName())
-                                && StringUtil.isContainNumber(i.getName())
                                 && p.matcher(i.getName()).find()
                 )
                 .count();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0375.java

@@ -48,6 +48,8 @@ public class BEH0375 extends QCCatalogue {
                         || maritalLabel.getText().contains("已逝")
                         || maritalLabel.getText().contains("丧偶")
                         || maritalLabel.getText().contains("详见原病历")
+                        || maritalLabel.getText().contains("见旧病历")
+                        || maritalLabel.getText().contains("见既往病历")
                 )
                 )
         ) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0376.java

@@ -55,7 +55,8 @@ public class BEH0376 extends QCCatalogue {
         }
         String maritalText = maritalLabel.getText();
         if (StringUtil.isNotBlank(maritalText)) {
-            List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女", "详见原病历", "无子女");
+            List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女", "详见原病历",
+                    "无子女","见旧病历","见既往病历");
             for (String word : words) {
                 if (maritalText.contains(word)) {
                     status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0397.java

@@ -59,9 +59,9 @@ public class BEH0397 extends QCCatalogue {
         }
         if ((StringUtil.isNotBlank(familyText)
                 && ((familyText.contains("父") || familyText.contains("双亲") || familyText.contains("母"))
-                && (familyText.contains("详见原病历") || familyText.contains("已故") || familyText.contains("体健") || familyText.contains("去世") || familyText.contains("健康")))
+                && (familyText.contains("详见原病历") || familyText.contains("见旧病历") || familyText.contains("见既往病历") || familyText.contains("已故") || familyText.contains("体健") || familyText.contains("去世") || familyText.contains("健康")))
                 || (StringUtil.isNotBlank(maritalText) && ((maritalText.contains("父") || maritalText.contains("双亲") || maritalText.contains("母"))
-                && (maritalText.contains("详见原病历") || maritalText.contains("已故") || maritalText.contains("体健") || maritalText.contains("去世") || familyText.contains("健康")))))) {
+                && (maritalText.contains("详见原病历") || maritalText.contains("见旧病历") || maritalText.contains("见既往病历") || maritalText.contains("已故") || maritalText.contains("体健") || maritalText.contains("去世") || familyText.contains("健康")))))) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0454.java

@@ -38,8 +38,10 @@ public class BEH0454 extends QCCatalogue {
             return;
         }
         if (StringUtils.isNotEmpty(pastLabel.getHeathCondition()) || pastLabel.getText().contains("既往")
-                || pastLabel.getText().contains("详见原病历")) {
+                || pastLabel.getText().contains("详见原病历") || pastLabel.getText().contains("健康状况")
+                || pastLabel.getText().contains("见旧病历")) {
             status.set("0");
+            return;
         }
         //既往有任一阳性疾病名称，则认为有健康状况
         List<Diag> diags = pastLabel.getDiags();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE02891.java

@@ -39,7 +39,7 @@ public class OPE02891 extends QCCatalogue {
         for (AnesthesiaRelatedDoc anesthesiaRelatedDoc : anesthesiaRelatedDocs) {
             Map<String, String> anesthesiaStructureMap = anesthesiaRelatedDoc.getStructureMap();
             String anesOperationName = anesthesiaStructureMap.get("手术名称");
-            String anesOperationStartDateStr = anesthesiaStructureMap.get("手术开始时间");
+            String anesOperationStartDateStr = anesthesiaStructureMap.get("手术日期");
             if (StringUtil.isBlank(anesOperationName)) {
                 continue;
             }
@@ -52,8 +52,8 @@ public class OPE02891 extends QCCatalogue {
                 continue;
             }
             Map<String, Date> startEndDate = getStartEndDate(operationDocs, anesOperationName);
-            if (startEndDate.get("手术开始时间") != null) {
-                Date operationStartDate = startEndDate.get("手术开始时间");
+            if (startEndDate.get("手术日期") != null) {
+                Date operationStartDate = startEndDate.get("手术日期");
                 if (!operationStartDate.equals(anesOperationStartDate)) {
                     status.set("-1");
                     return;
@@ -80,8 +80,8 @@ public class OPE02891 extends QCCatalogue {
             }
             Map<String, String> operationStructureMap = operationRecordDoc.getStructureMap();
             String operationName = operationStructureMap.get("手术名称");
-            String operationStartDateStr = operationStructureMap.get("手术开始时间");
-            String operationEndDateStr = operationStructureMap.get("手术结束时间");
+            String operationStartDateStr = operationStructureMap.get("手术日期");
+            String operationEndDateStr = operationStructureMap.get("手术日期");
             if (StringUtil.isBlank(operationName)) {
                 continue;
             }
@@ -100,10 +100,10 @@ public class OPE02891 extends QCCatalogue {
             }
         }
         if (startDate != null) {
-            startEndDateMap.put("手术开始时间", startDate);
+            startEndDateMap.put("手术日期", startDate);
         }
         if (endDate != null) {
-            startEndDateMap.put("手术结束时间", endDate);
+            startEndDateMap.put("手术日期", endDate);
         }
         return startEndDateMap;
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE02892.java

@@ -39,7 +39,7 @@ public class OPE02892 extends QCCatalogue {
         for (AnesthesiaRelatedDoc anesthesiaRelatedDoc : anesthesiaRelatedDocs) {
             Map<String, String> anesthesiaStructureMap = anesthesiaRelatedDoc.getStructureMap();
             String anesOperationName = anesthesiaStructureMap.get("手术名称");
-            String anesOperationEndDateStr = anesthesiaStructureMap.get("手术结束时间");
+            String anesOperationEndDateStr = anesthesiaStructureMap.get("手术日期");
             if (StringUtil.isBlank(anesOperationName)) {
                 continue;
             }
@@ -52,8 +52,8 @@ public class OPE02892 extends QCCatalogue {
                 continue;
             }
             Map<String, Date> startEndDate = getStartEndDate(operationDocs, anesOperationName);
-            if (startEndDate.get("手术结束时间") != null) {
-                Date operationEndDate = startEndDate.get("手术结束时间");
+            if (startEndDate.get("手术日期") != null) {
+                Date operationEndDate = startEndDate.get("手术日期");
                 if (!operationEndDate.equals(anesOperationEndDate)) {
                     status.set("-1");
                     return;
@@ -80,8 +80,8 @@ public class OPE02892 extends QCCatalogue {
             }
             Map<String, String> operationStructureMap = operationRecordDoc.getStructureMap();
             String operationName = operationStructureMap.get("手术名称");
-            String operationStartDateStr = operationStructureMap.get("手术开始时间");
-            String operationEndDateStr = operationStructureMap.get("手术结束时间");
+            String operationStartDateStr = operationStructureMap.get("手术日期");
+            String operationEndDateStr = operationStructureMap.get("手术日期");
             if (StringUtil.isBlank(operationName)) {
                 continue;
             }
@@ -100,10 +100,10 @@ public class OPE02892 extends QCCatalogue {
             }
         }
         if (startDate != null) {
-            startEndDateMap.put("手术开始时间", startDate);
+            startEndDateMap.put("手术日期", startDate);
         }
         if (endDate != null) {
-            startEndDateMap.put("手术结束时间", endDate);
+            startEndDateMap.put("手术日期", endDate);
         }
         return startEndDateMap;
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE02897.java

@@ -80,8 +80,8 @@ public class OPE02897 extends QCCatalogue {
             }
             Map<String, String> operationStructureMap = operationDiscussionDoc.getStructureMap();
             String operationName = operationStructureMap.get("手术名称");
-            String operationStartDateStr = operationStructureMap.get("手术开始时间");
-            String operationEndDateStr = operationStructureMap.get("手术结束时间");
+            String operationStartDateStr = operationStructureMap.get("手术日期");
+            String operationEndDateStr = operationStructureMap.get("手术日期");
             if (StringUtil.isBlank(operationName)) {
                 continue;
             }
@@ -100,10 +100,10 @@ public class OPE02897 extends QCCatalogue {
             }
         }
         if (startDate != null) {
-            startEndDateMap.put("手术开始时间", startDate);
+            startEndDateMap.put("手术日期", startDate);
         }
         if (endDate != null) {
-            startEndDateMap.put("手术结束时间", endDate);
+            startEndDateMap.put("手术日期", endDate);
         }
         return startEndDateMap;
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE02898.java

@@ -39,7 +39,7 @@ public class OPE02898 extends QCCatalogue {
         for (AnesthesiaRelatedDoc anesthesiaRelatedDoc : anesthesiaRelatedDocs) {
             Map<String, String> anesthesiaStructureMap = anesthesiaRelatedDoc.getStructureMap();
             String anesOperationName = anesthesiaStructureMap.get("手术名称");
-            String anesOperationStartDateStr = anesthesiaStructureMap.get("手术开始时间");
+            String anesOperationStartDateStr = anesthesiaStructureMap.get("手术日期");
             if (StringUtil.isBlank(anesOperationName)) {
                 continue;
             }
@@ -52,8 +52,8 @@ public class OPE02898 extends QCCatalogue {
                 continue;
             }
             Map<String, Date> startEndDate = getStartEndDate(operationDocs, anesOperationName);
-            if (startEndDate.get("手术开始时间") != null) {
-                Date operationStartDate = startEndDate.get("手术开始时间");
+            if (startEndDate.get("手术日期") != null) {
+                Date operationStartDate = startEndDate.get("手术日期");
                 if (!operationStartDate.equals(anesOperationStartDate)) {
                     status.set("-1");
                     return;
@@ -80,8 +80,8 @@ public class OPE02898 extends QCCatalogue {
             }
             Map<String, String> operationStructureMap = operationDiscussionDoc.getStructureMap();
             String operationName = operationStructureMap.get("手术名称");
-            String operationStartDateStr = operationStructureMap.get("手术开始时间");
-            String operationEndDateStr = operationStructureMap.get("手术结束时间");
+            String operationStartDateStr = operationStructureMap.get("手术日期");
+            String operationEndDateStr = operationStructureMap.get("手术日期");
             if (StringUtil.isBlank(operationName)) {
                 continue;
             }
@@ -100,10 +100,10 @@ public class OPE02898 extends QCCatalogue {
             }
         }
         if (startDate != null) {
-            startEndDateMap.put("手术开始时间", startDate);
+            startEndDateMap.put("手术日期", startDate);
         }
         if (endDate != null) {
-            startEndDateMap.put("手术结束时间", endDate);
+            startEndDateMap.put("手术日期", endDate);
         }
         return startEndDateMap;
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE02930.java

@@ -38,8 +38,8 @@ public class OPE02930 extends QCCatalogue {
                 continue;
             }
             Map<String, String> operationRecordStructureMap = operationRecordDoc.getStructureMap();
-            String operationStartDateStr = operationRecordStructureMap.get("手术开始时间");
-            String operationEndDateStr = operationRecordStructureMap.get("手术结束时间");
+            String operationStartDateStr = operationRecordStructureMap.get("手术日期");
+            String operationEndDateStr = operationRecordStructureMap.get("手术日期");
             if (StringUtil.isEmpty(operationStartDateStr) || StringUtil.isEmpty(operationEndDateStr)) {
                 continue;
             }

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

@@ -68,7 +68,7 @@ public class OPE0369 extends QCCatalogue {
             for (OperationDoc operationDoc : operationDocs) {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
-                    operationStartDate = operationDocStructureMap.get("手术开始时间");
+                    operationStartDate = operationDocStructureMap.get("手术日期");
                     if (operationStartDate.contains("年月日")) {
                         continue;
                     }
@@ -143,7 +143,7 @@ public class OPE0369 extends QCCatalogue {
                 continue;
             }
             Map<String, String> structureMap = operationRecordDoc.getStructureMap();
-            String operationStartDateStr = structureMap.get("手术开始时间");
+            String operationStartDateStr = structureMap.get("手术日期");
             if (StringUtil.isNotBlank(operationStartDateStr) && !operationStartDateStr.contains("年月日")) {
                 Date operationStartDate = StringUtil.parseDateTime(operationStartDateStr);
                 operationStartDate = DateUtil.dateZeroClear(operationStartDate);
@@ -151,14 +151,14 @@ public class OPE0369 extends QCCatalogue {
                     /* 放第一个手术记录的日期到operationDateList */
                     if (operationDateList.size() == 0) {
                         operationDate = new HashMap<>();
-                        operationDate.put("手术开始时间", operationStartDate);
+                        operationDate.put("手术日期", operationStartDate);
                         operationDateList.add(operationDate);
                         continue;
                     }
                     /* 如果其中一个手术记录的开始时间到结束时间之间还包含另一个手术，就不往operationDateList里加 */
                     boolean findInnerOperation = false;
                     for (Map<String, Date> date : operationDateList) {
-                        Date listStartDate = DateUtil.dateZeroClear(date.get("手术开始时间"));
+                        Date listStartDate = DateUtil.dateZeroClear(date.get("手术日期"));
                         if (listStartDate.equals(operationStartDate)) {
                             findInnerOperation = true;
                             break;
@@ -166,7 +166,7 @@ public class OPE0369 extends QCCatalogue {
                     }
                     if (!findInnerOperation) {
                         operationDate = new HashMap<>();
-                        operationDate.put("手术开始时间", operationStartDate);
+                        operationDate.put("手术日期", operationStartDate);
                         operationDateList.add(operationDate);
                     }
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE0628.java

@@ -24,25 +24,25 @@ public class OPE0628 extends QCCatalogue {
         status.set("0");
 //        boolean isOperativePatient = true;//是手术患者(暂时默认是)
 //        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
         if(operationDocs == null || operationDocs.size() == 0){
             status.set("0");
             return;
         }
-            if (ListUtil.isNotEmpty(operationDocs)) {
-                long count = operationDocs.stream().filter(operationDoc -> {
-                    boolean flag = false;
-                    if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("手术开始时间"))) {
-                        flag = true;
-                    }
-                    return flag;
-                }).count();
-                if (count > 0) {
-                    status.set("-1");
+        if (ListUtil.isNotEmpty(operationDocs)) {
+            long count = operationDocs.stream().filter(operationDoc -> {
+                boolean flag = false;
+                if (operationDoc.getOperationRecordDoc() != null
+                        && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("手术日期"))) {
+                    flag = true;
                 }
+                return flag;
+            }).count();
+            if (count > 0) {
+                status.set("-1");
             }
         }
+    }
 //    }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/operationdiscussion/OPE0630.java

@@ -37,7 +37,7 @@ public class OPE0630 extends QCCatalogue {
                 if (operationDoc.getOperationRecordDoc() == null){
                     continue;
                 }
-                String operationStartDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术开始时间");
+                String operationStartDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术日期");
                 if (CatalogueUtil.isEmpty(operationStartDateStr)) {
                     continue;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/preoperativediscussion/PRE0328.java

@@ -47,7 +47,7 @@ public class PRE0328 extends QCCatalogue {
             OperationRecordDoc operationRecordDoc = operationDocs.get(0).getOperationRecordDoc();
             String startTime = "";
             if (operationRecordDoc != null) {
-                startTime = operationRecordDoc.getStructureMap().get("手术开始时间");
+                startTime = operationRecordDoc.getStructureMap().get("手术日期");
             }
             if (StringUtil.isNotBlank(startTime) && StringUtil.isNotBlank(admisTime) &&
                     !startTime.contains("年月日")) {
@@ -104,7 +104,7 @@ public class PRE0328 extends QCCatalogue {
                 continue;
             }
             Map<String, String> structureMap = operationRecordDoc.getStructureMap();
-            String operationStartDateStr = structureMap.get("手术开始时间");
+            String operationStartDateStr = structureMap.get("手术日期");
             if (StringUtil.isNotBlank(operationStartDateStr) && !operationStartDateStr.contains("年月日")) {
                 Date operationStartDate = StringUtil.parseDateTime(operationStartDateStr);
                 operationStartDate = DateUtil.dateZeroClear(operationStartDate);
@@ -112,14 +112,14 @@ public class PRE0328 extends QCCatalogue {
                     /* 放第一个手术记录的日期到operationDateList */
                     if (operationDateList.size() == 0) {
                         operationDate = new HashMap<>();
-                        operationDate.put("手术开始时间", operationStartDate);
+                        operationDate.put("手术日期", operationStartDate);
                         operationDateList.add(operationDate);
                         continue;
                     }
                     /* 如果其中一个手术记录的开始时间到结束时间之间还包含另一个手术，就不往operationDateList里加 */
                     boolean findInnerOperation = false;
                     for (Map<String, Date> date : operationDateList) {
-                        Date listStartDate = DateUtil.dateZeroClear(date.get("手术开始时间"));
+                        Date listStartDate = DateUtil.dateZeroClear(date.get("手术日期"));
                         if (listStartDate.equals(operationStartDate)) {
                             findInnerOperation = true;
                             break;
@@ -127,7 +127,7 @@ public class PRE0328 extends QCCatalogue {
                     }
                     if (!findInnerOperation) {
                         operationDate = new HashMap<>();
-                        operationDate.put("手术开始时间", operationStartDate);
+                        operationDate.put("手术日期", operationStartDate);
                         operationDateList.add(operationDate);
                     }
                 }

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

@@ -35,6 +35,16 @@ public class THR02900 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs() != null && inputInfo.getThreeLevelWardDocs().size() > 0) {
             allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
         }
+        //宁海第一人民医院存在术后24小时模板
+        if (ListUtil.isNotEmpty(allDoctorWradDocs)) {
+            for (ThreeLevelWardDoc wardDoc : allDoctorWradDocs) {
+                Map<String, String> wardStructureMap = wardDoc.getStructureMap();
+                String recordTitle = wardStructureMap.get("查房标题");
+                if (StringUtil.isNotBlank(recordTitle) && recordTitle.contains("术后24小时")) {
+                    return;
+                }
+            }
+        }
         //标题
         String allTitle = "";
         //病情记录
@@ -54,16 +64,18 @@ public class THR02900 extends QCCatalogue {
             if (StringUtil.isNotBlank(opeAssName)) {
                 split = opeAssName.split("、");
                 firstAssistant = structureMap.get("助手");
-                opeEndTime = structureMap.get("手术结束时间");
+                opeEndTime = structureMap.get("手术日期");
             } else {
                 firstAssistant = structureMap.get("一助");
                 //取得手术时间截取结束时间（格式 2020-07-24 10:30-2020-07-24 11:45）
-                opeEndTime = structureMap.get("手术时间");
-                opeEndTime = opeEndTime.substring(17);
+                opeEndTime = structureMap.get("手术日期");
+                if (StringUtil.isBlank(opeEndTime) || opeEndTime.contains("年月日")) {
+                    continue;
+                }
             }
             String chiefSurgeon = structureMap.get("主刀医师");
-            if (opeEndTime.contains("年月日")) {
-                continue;
+            if (chiefSurgeon.contains("、")) {
+                chiefSurgeon = chiefSurgeon.split("、")[0];
             }
             Date opeEndDate = CatalogueUtil.parseStringDate(opeEndTime);
             if (opeEndDate == null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/threelevelward/THR03090.java

@@ -40,8 +40,8 @@ public class THR03090 extends QCCatalogue {
         String operationStartDate = "";
         if (operationDocs.get(operationDocs.size() - 1).getOperationRecordDoc() != null) {
             Map<String, String> operationDocStructureMap = operationDocs.get(operationDocs.size() - 1).getOperationRecordDoc().getStructureMap();
-            operationStartDate = operationDocStructureMap.get("手术开始时间");
-            if (operationStartDate.contains("年月日")) {
+            operationStartDate = operationDocStructureMap.get("手术日期");
+            if (StringUtil.isNotBlank(operationStartDate) && operationStartDate.contains("年月日")) {
                 operationStartDate = DateUtil.nowString();
             }
         }