义乌入院记录初步诊断医师签名时间处理修改，规则添加逻辑

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH02902.java

@@ -35,6 +35,7 @@ public class BEH02902 extends QCCatalogue {
 
         if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺")
                 || pacsText.contains("暂无")|| pacsText.contains("院")
+                || pacsText.contains("病理")
                 || pacsText.contains("科") || pacsText.contains("公司"))) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH02903.java

@@ -32,11 +32,11 @@ public class BEH02903 extends QCCatalogue {
             return;
         }
 
-        if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺") || pacsText.contains("暂无"))) {
+        if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺") || pacsText.contains("病理") || pacsText.contains("暂无"))) {
             status.set("0");
             return;
         }
-        if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("20") )) {
+        if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("20"))) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0400.java

@@ -25,7 +25,7 @@ public class BEH0400 extends QCCatalogue {
             status.set("0");
             return;
         }
-        List<String> Str = Arrays.asList("咳嗽气喘史", "胸闷心悸史", "腹痛腹泻史", "多饮多尿史", "浮肿少尿史", "尿频尿痛史", "抽搐史", "出血史", "过敏史", "药物过敏史", "传染病史", "外伤手术史", "输血史", "重大疾病史和治疗史",
+        List<String> Str = Arrays.asList("既往史","咳嗽气喘史", "胸闷心悸史", "腹痛腹泻史", "多饮多尿史", "浮肿少尿史", "尿频尿痛史", "抽搐史", "出血史", "过敏史", "药物过敏史", "传染病史", "外伤手术史", "输血史", "重大疾病史和治疗史",
                 "既往体健");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         for (String s : Str) {

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -60,14 +60,18 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                 dailyTrans(sourceMap, text, behDeptId);
             } else {
                 List<String> titles = Lists.newArrayList("婚    姻", "婚姻状况", "住      址", "供 史 者", "性      别", "婚　　姻", "民　　族", "民    族", "个人史", "妇科检查", "产科检查",
-                        "实验室", "初步诊断", "修正诊断", "补充诊断", "初步诊断医师", "修正诊断医师", "补充诊断医师", "初步诊断日期", "修正诊断日期", "补充诊断日期", "诊断和诊断修正", "婚 育 史", "家 族 史", "体 格 检 查（一）", "现 病 史", "既 往 史", "系统回顾");
+                        "实验室", "诊断和诊断修正", "婚 育 史", "家 族 史", "体 格 检 查（一）", "现 病 史", "既 往 史", "系统回顾");
+                List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
+                CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
                 List<String> modifyKey = Lists.newArrayList("初步诊断", "修正诊断", "补充诊断");
-                List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(modifyKey, text);
+                sortTitles = CommonAnalysisUtil.sortTitlesNoColon(modifyKey, text);
+                text = text.substring(text.indexOf("初步诊断:")).replaceAll("[ ]","");
                 for (String key : sortTitles) {
                     text = modifyDiagKey(text, key);
                 }
-                sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
-                CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
+                modifyKey = Lists.newArrayList("初步诊断", "修正诊断", "补充诊断", "初步诊断医师", "修正诊断医师", "补充诊断医师", "初步诊断时间", "修正诊断时间", "补充诊断时间");
+                sortTitles = CommonAnalysisUtil.sortTitles(modifyKey, text);
+                CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
                 if (sourceMap.containsKey("修正诊断") && (sourceMap.get("修正诊断").contains(":") || sourceMap.get("修正诊断").contains("："))) {
                     sourceMap.put("修正诊断", "");
                 }
@@ -124,6 +128,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         addKeyMapping(structureMap, "职业", "工作性质");
         BeHospitalizedDoc beHospitalizedDoc = beHospitalizedDocGen(structureMap); // 不走共用
         beHospitalizedDoc.setPageData((Map) structureMap);
+        structureMap.forEach((k, v) -> System.out.println(k + "\n" + v + "\n----------------------------------------"));
         return beHospitalizedDoc;
     }
 
@@ -131,6 +136,9 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "初步诊断医师=初步诊断医师签名",
             "修正诊断医师=修正诊断医师签名",
             "补充诊断医师=补充诊断医师签名",
+            "初步诊断时间=初步诊断日期",
+            "补充诊断时间=补充诊断日期",
+            "补充诊断时间=补充诊断日期",
             "本人姓名=姓名",
             "性别=性别",
             "年龄=年龄",
@@ -406,7 +414,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
     private String modifyDiagKey(String text, String key) {
         if (text.contains(key + ":")) {
             text = text.replaceFirst("医师签名", key + "医师");
-            text = text.replaceFirst("日    期", key + "日期");
+            text = text.replaceFirst("日期", key + "时间");
         }
         return text;
     }