|
@@ -95,6 +95,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
|
|
|
private OperationDiscussionDoc getOperationDiscussionDoc(Map<String, Object> contentMap) {
|
|
|
String content = contentMap.get("xmlText").toString();
|
|
|
Map<String, String> structureMap = null;
|
|
|
+ OperationDiscussionDoc operationDiscussionDoc = new OperationDiscussionDoc();
|
|
|
if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
|
|
|
structureMap = (Map) FastJsonUtils.getJsonToMap(content);
|
|
|
} else {
|
|
@@ -107,11 +108,13 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
|
|
|
structureMap.put("记录编号", contentMap.get("recId").toString());
|
|
|
structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
|
|
|
}
|
|
|
+ if (MapUtils.isNotEmpty(structureMap)) {
|
|
|
+ String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
|
|
|
+ operationDiscussionDoc.setText(text);
|
|
|
+ }
|
|
|
}
|
|
|
if (MapUtils.isNotEmpty(structureMap)) {
|
|
|
- OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
|
|
|
- String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
|
|
|
- operationDiscussionDoc.setText(text);
|
|
|
+ operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
|
|
|
operationDiscussionDoc.setPageData((Map) structureMap);
|
|
|
return operationDiscussionDoc;
|
|
|
} else {
|