义乌入院记录婚姻、民族字段映射修改

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -49,10 +49,10 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
-            List<String> titles = Lists.newArrayList("个人史","妇科检查","产科检查","实验室","初步诊断","修正诊断","补充诊断","医师签名","日    期");
+            List<String> titles = Lists.newArrayList("婚　　姻","民　　族","个人史","妇科检查","产科检查","实验室","初步诊断","修正诊断","补充诊断","医师签名","日    期");
             String text = sourceMap.get("原始文本");
-            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
-            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
+            CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
             //妇科日间出院医嘱部分特殊处理
             List<String> titles1 = Lists.newArrayList("注意事项","医生办公室电话","随访安排","活动能力与生活自理情况"
                     ,"出院带药","出院去向");
@@ -114,6 +114,15 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                 String value=structureMap.get("个人史").split("月经史")[0];
                 structureMap.put("个人史",value);
             }
+            //婚姻和民族处理
+            if(structureMap.containsKey("婚　　姻")){
+                String value=structureMap.get("婚　　姻").split(" ")[0];
+                structureMap.put("婚姻状况",value);
+            }
+            if(structureMap.containsKey("民　　族")){
+                String value=structureMap.get("民　　族").split(" ")[0];
+                structureMap.put("民族",value);
+            }
             OrdinaryAssistant.removeBlank(structureMap);
         }
         /*if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {