|
@@ -129,33 +129,19 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
|
|
}
|
|
}
|
|
|
|
|
|
private ConsultationResultsDoc getConsultationResultsDoc(String content) {
|
|
private ConsultationResultsDoc getConsultationResultsDoc(String content) {
|
|
- Map<String, String> pageData = Preproc.extract_doc_pub(true, consultationResults_pageDataTitles, content);
|
|
|
|
- pageData.put("病程记录内容",
|
|
|
|
- pageData.get("病程记录内容")
|
|
|
|
- .replace(pageData.get("病程记录时间"), "")
|
|
|
|
- .replace(pageData.get("病程记录名称"), "")
|
|
|
|
- );
|
|
|
|
-
|
|
|
|
- List<String> targetTitles = Lists.newArrayList();
|
|
|
|
- consultationResults_sourceTitles.forEach(sourceTitle -> {
|
|
|
|
- String targetTitle = "";
|
|
|
|
- for (int index = 0; index < sourceTitle.length(); index++) {
|
|
|
|
- if (index == sourceTitle.length() - 1) {
|
|
|
|
- targetTitle += sourceTitle.substring(index, index + 1);
|
|
|
|
- } else {
|
|
|
|
- targetTitle += sourceTitle.substring(index, index + 1) + "[\\s\\p{Zs}]*";
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- targetTitles.add(targetTitle);
|
|
|
|
- });
|
|
|
|
|
|
+ Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
|
|
|
|
+ Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
|
|
|
|
|
|
- Map<String, String> sourceMap = Preproc.extract_doc_pub(true, targetTitles, content);
|
|
|
|
- sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
|
|
|
|
|
|
+ String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
|
|
|
|
+ if (StringUtil.isBlank(text)) {
|
|
|
|
+ text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent");
|
|
|
|
+ }
|
|
|
|
+ Map<String, String> cutWordMap = Preproc.getCutWordMap(true, consultationApplication_sourceTitles, text);
|
|
|
|
+ cutWordMap.putAll(structureMap);
|
|
|
|
|
|
- ConsultationResultsDoc consultationResultsDoc = ModelDocGenerate.consultationResultsDocGen(sourceMap);
|
|
|
|
|
|
+ ConsultationResultsDoc consultationResultsDoc = ModelDocGenerate.consultationResultsDocGen(cutWordMap);
|
|
consultationResultsDoc.setText(content);
|
|
consultationResultsDoc.setText(content);
|
|
- consultationResultsDoc.setPageData((Map) pageData);
|
|
|
|
-
|
|
|
|
|
|
+ consultationResultsDoc.setPageData((Map) xmlNodeValueMap);
|
|
return consultationResultsDoc;
|
|
return consultationResultsDoc;
|
|
}
|
|
}
|
|
|
|
|