义务中心医院：切词修改

trans/src/main/java/com/lantone/qc/trans/comsis/CommonAnalysisUtil.java

@@ -141,7 +141,7 @@ public class CommonAnalysisUtil {
             return;
         }
         String beforeTitle = null, title = null, newTitle = null, value = null;
-        beforeTitle = titles.get(Math.max(depth - 1, 0));
+        beforeTitle = StringUtil.removeBlank(titles.get(Math.max(depth - 1, 0)));
         title = titles.get(Math.min(depth, titles.size() - 1));
         if (depth == titles.size()) {
             /*if (line.contains("\n")) {
@@ -149,7 +149,9 @@ public class CommonAnalysisUtil {
             }
             */
             value = line.replace("\n", "");
-            structureMap.put(beforeTitle, value.trim());
+            if (StringUtil.isBlank(structureMap.get(beforeTitle))) {
+                structureMap.put(beforeTitle, value.trim());
+            }
             return;
         }
         if (line.contains(title + "：") || line.contains(title + ":")) {
@@ -160,7 +162,9 @@ public class CommonAnalysisUtil {
             }
             if (depth > 0) {
                 value = line.substring(0, line.indexOf(newTitle));
-                structureMap.put(beforeTitle.replace(" ", ""), value.trim().replace("\n", ""));
+                if (StringUtil.isBlank(structureMap.get(beforeTitle))) {
+                    structureMap.put(beforeTitle, value.trim().replace("\n", ""));
+                }
             }
             line = line.substring(line.indexOf(newTitle) + newTitle.length());
             depth++;

trans/src/main/java/com/lantone/qc/trans/ywzxyy/util/YwzxyyBeHospitalizedXmlAnalysis.java

@@ -55,8 +55,11 @@ public class YwzxyyBeHospitalizedXmlAnalysis implements YwzxyyXmlAnalysis {
                     .replaceAll("(</记录医师>)[\\s\\S]{0,10}(<记录医师签名时间>)", "</记录医师>记录医师签名时间:<记录医师签名时间>");
             xml = matRegx(xml, "(</专科检查>检查医师)[\\s\\S]*(<病历记录时间>)", "<病历记录时间>", "记录医师签名时间:<病历记录时间>");
             xml = matRegx(xml, "(</专科检查>检查医师)[\\s\\S]*(<记录医师签名时间>)", "<记录医师签名时间>", "记录医师签名时间:<记录医师签名时间>");
+            xml = xml.replace("体格检查表(二)补 充 及 专 科 情 况", "体格检查表(二)补 充 及 专 科 情 况:")
+                    .replace("体格检查（一）", "体格检查（一）:")
+                    .replace("营养风险筛查", "营养风险筛查:");
             String text = YwzxyyXmlUtil.xml2Txt(xml);
-            List<String> titles = CommonAnalysisUtil.sortTitlesNoColon(
+            List<String> titles = CommonAnalysisUtil.sortTitles(
                     Lists.newArrayList("家长姓名", "姓　　名", "姓　　名", "姓名", "性 　 别", "性    别", "性别", "年    龄",
                             "年龄", "民　　族", "民    族", "民族", "现 住 址", "现住址", "联系电话", "婚    姻", "婚姻", "出 生 地",
                             "出生地", "职    业", "职业", "联系地址", "入院日期", "入院时间", "供 史 者", "供史者", "病史陈述者",
@@ -66,7 +69,7 @@ public class YwzxyyBeHospitalizedXmlAnalysis implements YwzxyyXmlAnalysis {
                             "体格检查表(二)补 充 及 专 科 情 况", "实验室检查", "体格检查", "体  格  检  查", "专科检查", "检查医师"),
                     text
             );
-            CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, structureMap);
+            CommonAnalysisUtil.cutByTitles(text, titles, 0, structureMap);
             if (structureMap.containsKey("体格检查（一）")) {
                 structureMap.put("体格检查", structureMap.get("体格检查（一）"));
                 structureMap.remove("体格检查（一）");