|
|
@@ -50,7 +50,8 @@ 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);
|
|
|
@@ -112,9 +113,16 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
|
|
|
}
|
|
|
if (sourceMap.containsKey("医师签名")) {
|
|
|
String value = sourceMap.get("医师签名").replaceAll("日期", "").
|
|
|
- replaceAll(":", "").replaceAll("\\d", "").replaceAll("--", "");
|
|
|
+ replaceAll(":", "").replaceAll("医师签名", "").
|
|
|
+ replaceAll("\\d", "").replaceAll("--", "");
|
|
|
sourceMap.put("医师签名", value);
|
|
|
}
|
|
|
+ if (sourceMap.containsKey("医生签名")) {
|
|
|
+ String value = sourceMap.get("医生签名").replaceAll("日期", "").
|
|
|
+ replaceAll(":", "").replaceAll("医生签名", "").replaceAll("签名时间", "").
|
|
|
+ replaceAll("\\d", "").replaceAll("--", "");
|
|
|
+ sourceMap.put("医生签名", value);
|
|
|
+ }
|
|
|
//产科入院记录个人史处理
|
|
|
if (sourceMap.containsKey("个人史")) {
|
|
|
String value = sourceMap.get("个人史").split("月经史")[0];
|
|
|
@@ -204,6 +212,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
|
|
|
"患者工作单位名称=户口地址",
|
|
|
"出生日期时间=出生日期",
|
|
|
"医师签名=初步诊断医师签名",
|
|
|
+ "医生签名=初步诊断医师签名",
|
|
|
"签字日期=初步诊断日期",
|
|
|
"供史者=病史陈述者",
|
|
|
"无痛人流主诉=主诉",
|
wangsy