|
@@ -3,6 +3,7 @@ package com.lantone.qc.trans.changx;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.Sets;
|
|
import com.google.common.collect.Sets;
|
|
|
|
+import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
|
|
import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.OperationDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.OperationDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.OperationInformedConsentDoc;
|
|
import com.lantone.qc.pub.model.doc.operation.OperationInformedConsentDoc;
|
|
@@ -13,7 +14,6 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
import com.lantone.qc.trans.ModelDocTrans;
|
|
import com.lantone.qc.trans.ModelDocTrans;
|
|
-import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
|
|
|
|
import com.lantone.qc.trans.comsis.ModelDocGenerate;
|
|
import com.lantone.qc.trans.comsis.ModelDocGenerate;
|
|
import com.lantone.qc.trans.comsis.OrdinaryAssistant;
|
|
import com.lantone.qc.trans.comsis.OrdinaryAssistant;
|
|
import com.lantone.qc.trans.comsis.Preproc;
|
|
import com.lantone.qc.trans.comsis.Preproc;
|
|
@@ -100,9 +100,18 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
|
|
structureMap.put("记录医师", structureMap.get("签名"));
|
|
structureMap.put("记录医师", structureMap.get("签名"));
|
|
}
|
|
}
|
|
|
|
|
|
- String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
|
|
|
|
- if (StringUtil.isBlank(text)) {
|
|
|
|
- text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region");
|
|
|
|
|
|
+ String text = null;
|
|
|
|
+ String[] nodePaths = {
|
|
|
|
+ "//DocObjContent/Region/Content_Text",
|
|
|
|
+ "//DocObjContent/Region",
|
|
|
|
+ "//DocObjContent/Content_Text",
|
|
|
|
+ "//DocObjContent"
|
|
|
|
+ };
|
|
|
|
+ for (String nodePath : nodePaths) {
|
|
|
|
+ text = CxXmlUtil.getTextByNodePath(content, nodePath);
|
|
|
|
+ if (StringUtil.isNotBlank(text)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationDiscussion_sourceTitles, text);
|
|
Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationDiscussion_sourceTitles, text);
|
|
cutWordMap.putAll(structureMap);
|
|
cutWordMap.putAll(structureMap);
|