|
|
@@ -49,7 +49,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.sortTitles(titles, text);
|
|
|
CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
|
|
|
@@ -80,6 +80,29 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
|
|
|
String value =structureMap.get("个人史").split("1")[0];
|
|
|
structureMap.put("个人史",value);
|
|
|
}
|
|
|
+ //入院记录下方的记录者签名和时间
|
|
|
+ if(structureMap.containsKey("修正诊断")){
|
|
|
+ String value=structureMap.get("修正诊断").replaceAll("医师签名","").
|
|
|
+ replaceAll(":","").
|
|
|
+ replaceAll("日 期","").
|
|
|
+ replaceAll("■","").
|
|
|
+ replaceAll("补充诊断","").
|
|
|
+ replaceAll("修正诊断","").
|
|
|
+ replaceAll("\"","").
|
|
|
+ replaceAll("：","");
|
|
|
+ structureMap.put("修正诊断",value);
|
|
|
+ }
|
|
|
+ if(structureMap.containsKey("补充诊断")){
|
|
|
+ String value=structureMap.get("修正诊断").replaceAll("医师签名","").
|
|
|
+ replaceAll(":","").
|
|
|
+ replaceAll("日 期","").
|
|
|
+ replaceAll("■","").
|
|
|
+ replaceAll("补充诊断","").
|
|
|
+ replaceAll("修正诊断","").
|
|
|
+ replaceAll("\"","").
|
|
|
+ replaceAll("：","");
|
|
|
+ structureMap.put("修正诊断",value);
|
|
|
+ }
|
|
|
OrdinaryAssistant.removeBlank(structureMap);
|
|
|
}
|
|
|
/*if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {
|
|
|
@@ -167,7 +190,8 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
|
|
|
"活动能力与生活自理情况=出院医嘱",
|
|
|
"患者籍贯新=籍贯",
|
|
|
"现住址邮编=邮政编码",
|
|
|
- "患者签名时间=初步诊断日期"
|
|
|
+ "患者签名时间=初步诊断日期",
|
|
|
+ "日期=初步诊断日期"
|
|
|
|
|
|
);
|
|
|
|
fangqw