恩泽身高体重解析修改

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

@@ -151,8 +151,36 @@ public class EzXmlAnalysis {
         if (tgjcNode != null) {
             Node ybqkNode = tgjcNode.selectSingleNode("section[@name='一般情况']");
             if (ybqkNode != null) {
-                elementInsertMap((Element) tgjcNode.selectSingleNode("fieldelem[@name='身高']"), map);
-                elementInsertMap((Element) tgjcNode.selectSingleNode("fieldelem[@name='体重']"), map);
+                elementInsertMap((Element) ybqkNode.selectSingleNode("fieldelem[@name='身高']"), map);
+                elementInsertMap((Element) ybqkNode.selectSingleNode("fieldelem[@name='体重']"), map);
+
+                String ybqkText = elementTxt(ybqkNode);
+                if (!map.containsKey("身高")){
+                    CommonAnalysisUtil.cutByTitlesNoColon(ybqkText,Lists.newArrayList("身高"),0,map);
+
+                }
+                if (!map.containsKey("体重")){
+                    CommonAnalysisUtil.cutByTitlesNoColon(ybqkText,Lists.newArrayList("体重"),0,map);
+                }
+                Pattern pattern = Pattern.compile("[0-9]+");
+                if (map.containsKey("身高")){
+                    String value = map.get("身高");
+                    if (StringUtil.isNotBlank(value)) {
+                        Matcher matcher = pattern.matcher(value);
+                        if (matcher.find()){
+                            map.put("身高",matcher.group());
+                        }
+                    }
+                }
+                if (map.containsKey("体重")){
+                    String value = map.get("体重");
+                    if (StringUtil.isNotBlank(value)) {
+                        Matcher matcher = pattern.matcher(value);
+                        if (matcher.find()){
+                            map.put("体重",matcher.group());
+                        }
+                    }
+                }
             }
         }
     }