Merge remote-tracking branch 'origin/dev-1.2' into dev-1.2

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0035.java

@@ -40,6 +40,9 @@ public class BEH0035 extends QCCatalogue {
                         .map(i -> i.getAllergyMedicine().getName()).distinct().collect(Collectors.toList()),
                 pastLabel.getText()
         );
+        if(wtAmNames.contains("止痛片")){
+            return;
+        }
         if (ListUtil.isNotEmpty(wtAmNames)) {
             status.set("-1");
             for (String wtAmName : wtAmNames) {

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.changx;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 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.OperationDoc;
 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.StringUtil;
 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.OrdinaryAssistant;
 import com.lantone.qc.trans.comsis.Preproc;
@@ -100,9 +100,18 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             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);
         cutWordMap.putAll(structureMap);
@@ -139,7 +148,9 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "手术结束时间=",
             "麻醉方式=",
             "手术方式=",
+            "手术方式++++手术名称=手术方式",
             "术中诊断++++初步诊断=术中诊断",
+            "术中诊断++++术后诊断=术中诊断",
             "手术经过=手术简要经过",
             "患者术后情况=",
             "术后处理措施=",