术前小结解析修改

trans/src/main/java/com/lantone/qc/trans/beilun/util/ez/EzXmlAnalysis.java

@@ -34,7 +34,6 @@ public class EzXmlAnalysis {
         Element rootElement = doc.getRootElement();
         jbxxInsertMap(rootElement, map);
         tgjcInsertMap(rootElement, map);
-        sgtzInsertMap(rootElement, map);
         fzjcInsertMap(rootElement, map);
         zkjcInsertMap(rootElement, map);
         disInsertMap(rootElement, map);
@@ -52,7 +51,7 @@ public class EzXmlAnalysis {
         if (StringUtil.isNotBlank(signTimeStr)) {
             rootText = rootText.substring(0, rootText.lastIndexOf(signTimeStr));
         }
-        titles = CommonAnalysisUtil.sortTitles(titles, rootText);
+        titles = CommonAnalysisUtil.sortTitlesNoColon(titles, rootText);
         CommonAnalysisUtil.cutByTitlesNoColon(rootText, titles, 0, map);
     }
 
@@ -64,7 +63,7 @@ public class EzXmlAnalysis {
         Node disNode = rootElement.selectSingleNode("section[@name='诊断']");
         if (disNode != null) {
             String disText = elementTxt(disNode);
-            List<String> titles = CommonAnalysisUtil.sortTitles(Lists.newArrayList("初步诊断", "补充诊断", "再次补充诊断", "修正诊断", "出院诊断"), disText);
+            List<String> titles = CommonAnalysisUtil.sortTitlesNoColon(Lists.newArrayList("初步诊断", "补充诊断", "再次补充诊断", "修正诊断", "出院诊断"), disText);
             CommonAnalysisUtil.cutByTitlesNoColon(disText, titles, 0, map);
             titles.forEach(title -> {
                 disExt(map, title);
@@ -161,7 +160,7 @@ public class EzXmlAnalysis {
 
                 String ybqkText = elementTxt(ybqkNode);
                 List<String> titles = Lists.newArrayList("身高", "体重");
-                titles = CommonAnalysisUtil.sortTitles(titles, ybqkText);
+                titles = CommonAnalysisUtil.sortTitlesNoColon(titles, ybqkText);
                 CommonAnalysisUtil.cutByTitlesNoColon(ybqkText, titles, 0, map2);
                 sgtzxyInsertMap(map2);
             }
@@ -192,7 +191,7 @@ public class EzXmlAnalysis {
                 Map<String, String> map2 = Maps.newHashMap();
                 String smtzText = elementTxt(smtzNode);
                 List<String> titles = Lists.newArrayList("身高", "体重", "血压", "BP");
-                titles = CommonAnalysisUtil.sortTitles(titles, smtzText);
+                titles = CommonAnalysisUtil.sortTitlesNoColon(titles, smtzText);
                 CommonAnalysisUtil.cutByTitlesNoColon(smtzText, titles, 0, map2);
                 sgtzxyInsertMap(map2);
 
@@ -210,7 +209,7 @@ public class EzXmlAnalysis {
 
     //身高、体重、血压公共处理方法
     private static void sgtzxyInsertMap(Map<String, String> map) {
-        Pattern pattern = Pattern.compile("[0-9]+[.]{0,1}[0-9]+");
+        Pattern pattern = Pattern.compile("[0-9]+[.]{0,1}[0-9]*");
         if (map.containsKey("身高")) {
             String value = map.get("身高");
             if (StringUtil.isNotBlank(value)) {
@@ -235,7 +234,7 @@ public class EzXmlAnalysis {
                 }
             }
         }
-        pattern = Pattern.compile("[0-9]+[.]{0,1}[0-9]+/[0-9]+[.]{0,1}[0-9]+");
+        pattern = Pattern.compile("[0-9]+[.]{0,1}[0-9]*/[0-9]+[.]{0,1}[0-9]*");
         if (map.containsKey("血压") || map.containsKey("BP")) {
             String value = map.get("血压");
             if (StringUtil.isBlank(value)) {
@@ -283,6 +282,7 @@ public class EzXmlAnalysis {
             }
             map.put("脊柱", jz);
             map.put("四肢", sz);
+            sgtzInsertMap(rootElement, map);
             rootElement.remove(tgjcNode);
         }
     }