|
|
@@ -50,7 +50,7 @@ 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.sortTitlesNoColon(titles, text);
|
|
|
CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
|
|
|
@@ -125,13 +125,17 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
|
|
|
//入院记录标题部分解析不出的 婚姻和民族处理
|
|
|
//注意中间的空格是什么字符
|
|
|
List<String> titletitles = Lists.newArrayList("住 址",
|
|
|
- "婚 姻","民 族","供 史 者","性 别","婚 姻","婚姻状况");
|
|
|
+ "婚 姻","民 族","民 族","供 史 者","性 别","婚 姻","婚姻状况");
|
|
|
for (String str: titletitles) {
|
|
|
String str1=str.replaceAll(" ","").replaceAll(" ","");
|
|
|
if(sourceMap.containsKey(str)){
|
|
|
String value=(sourceMap.get(str).split(" ")[0]).split("\\\\n")[0];
|
|
|
sourceMap.put(str1,value);
|
|
|
}
|
|
|
+ if(sourceMap.containsKey(str1)){
|
|
|
+ String value=(sourceMap.get(str1).split(" ")[0]).split("\\\\n")[0];
|
|
|
+ sourceMap.put(str1,value);
|
|
|
+ }
|
|
|
}
|
|
|
structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
|
|
|
OrdinaryAssistant.removeBlank(structureMap);
|
fangqw