|
@@ -58,7 +58,7 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
|
|
|
.replace("9315", "④");
|
|
|
|
|
|
if (StringUtil.isNotBlank(htmlContent)) {
|
|
|
- titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
|
|
|
+// titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
|
|
|
List<String> sortTitles = XyCommonAnalysisUtil.sortTitles(titles, htmlContent);
|
|
|
XyCommonAnalysisUtil.cutByTitles(htmlContent, titles, 0, structureMap);
|
|
|
}
|
|
@@ -94,6 +94,20 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
|
|
|
structureMap.put("基本信息",diagString.substring(index, diagString.length()));
|
|
|
}
|
|
|
}
|
|
|
+ //解决出院诊断中包含出院医嘱的情况
|
|
|
+ if (StringUtils.isNotEmpty(structureMap.get("出院诊断"))&&structureMap.get("出院诊断").contains("出院医嘱")){
|
|
|
+ String[] strings=structureMap.get("出院诊断").split("出院医嘱");
|
|
|
+ structureMap.put("出院诊断",strings[0]);
|
|
|
+ structureMap.put("出院医嘱",strings[1]);
|
|
|
+ }
|
|
|
+ //解决出院时情况包含出院诊断的情况
|
|
|
+ if (StringUtils.isNotEmpty(structureMap.get("出院时情况"))&&structureMap.get("出院时情况").contains("出院诊断")){
|
|
|
+ String[] strings=structureMap.get("出院时情况").split("出院诊断");
|
|
|
+ structureMap.put("出院时情况",strings[0]);
|
|
|
+ structureMap.put("出院诊断",strings[1]);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
|
|
|
} catch (Exception e) {
|
|
|
log.error(e.getMessage(), e);
|