Browse Source

义务中心医院:切词修改

rengb 4 years atrás
parent
commit
8424a69273

+ 2 - 2
trans/src/main/java/com/lantone/qc/trans/comsis/CommonAnalysisUtil.java

@@ -222,7 +222,7 @@ public class CommonAnalysisUtil {
             if (value.startsWith(":") || value.startsWith(":")) {
                 value = value.replaceFirst("[::]", "");
             }
-            structureMap.put(beforeTitle, value.replace("\n", ""));
+            structureMap.put(StringUtil.removeBlank(beforeTitle), value.replace("\n", ""));
             return;
         }
         if (line.contains(title)) {
@@ -233,7 +233,7 @@ public class CommonAnalysisUtil {
                 if (value.startsWith(":") || value.startsWith(":")) {
                     value = value.replaceFirst("[::]", "");
                 }
-                structureMap.put(beforeTitle.replace(" ", ""), value.trim().replace("\n", ""));
+                structureMap.put(StringUtil.removeBlank(beforeTitle), value.trim().replace("\n", ""));
             }
             line = line.substring(line.indexOf(newTitle) + newTitle.length());
             depth++;

+ 0 - 9
trans/src/main/java/com/lantone/qc/trans/ywzxyy/util/YwzxyyBeHospitalizedXmlAnalysis.java

@@ -67,7 +67,6 @@ public class YwzxyyBeHospitalizedXmlAnalysis implements YwzxyyXmlAnalysis {
                     text
             );
             CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, structureMap);
-            structureMap = keyRemoveBlank(structureMap);
             if (structureMap.containsKey("体格检查(一)")) {
                 structureMap.put("体格检查", structureMap.get("体格检查(一)"));
                 structureMap.remove("体格检查(一)");
@@ -82,14 +81,6 @@ public class YwzxyyBeHospitalizedXmlAnalysis implements YwzxyyXmlAnalysis {
         return structureMap;
     }
 
-    private Map<String, String> keyRemoveBlank(Map<String, String> sourceMap) {
-        Map<String, String> structureMap = Maps.newHashMap();
-        sourceMap.forEach((key, value) -> {
-            structureMap.put(StringUtil.removeBlank(key), sourceMap.get(key));
-        });
-        return structureMap;
-    }
-
     private String matRegx(String source, String regex1, String regex2, String val) {
         if (StringUtil.isNotBlank(source) && StringUtil.isNotBlank(regex1)
                 && StringUtil.isNotBlank(regex2) && StringUtil.isNotBlank(val)) {