入院记录中身高体重标识兼容

structure-center/src/main/java/com/lantone/structure/facade/tran/BeHospitalizedTran.java

@@ -262,14 +262,22 @@ public class BeHospitalizedTran extends TargetTran {
             //体格检查-身高、体重
             if(StringUtil.isNotEmpty(retMap.get("一般情况"))){
                 String condition = retMap.get("一般情况");
-                if(condition.contains("体重") && condition.contains("kg")){
-                    String weight = condition.substring(condition.indexOf("体重") + "体重".length(), condition.indexOf("kg") + "kg".length());
+                String weightStr = "kg";
+                if(condition.contains("KG")){
+                    weightStr = "KG";
+                }
+                if(condition.contains("体重") && condition.contains(weightStr)){
+                    String weight = condition.substring(condition.indexOf("体重") + "体重".length(), condition.indexOf(weightStr) + weightStr.length());
                     if(StringUtil.isNotEmpty(weight)){
                         retMap.put("体格检查--体重（kg）", weight);
                     }
                 }
-                if(condition.contains("身高") && condition.contains("cm")){
-                    String height = condition.substring(condition.indexOf("身高") + "身高".length(), condition.indexOf("cm") + "cm".length());
+                String heightStr = "cm";
+                if(condition.contains("CM")){
+                    heightStr = "CM";
+                }
+                if(condition.contains("身高") && condition.contains(heightStr)){
+                    String height = condition.substring(condition.indexOf("身高") + "身高".length(), condition.indexOf(heightStr) + heightStr.length());
                     if(StringUtil.isNotEmpty(height)){
                         retMap.put("体格检查--身高（cm）", height);
                     }