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

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

@@ -29,7 +29,7 @@ public class BEH0415 extends QCCatalogue {
             String contactAddress_bh = structureMap.get("民族");
             String contactAddress_first = firstStructMap.get(Content.nation);
             if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
-                if (!contactAddress_first.equals(contactAddress_bh)) {
+                if (!contactAddress_first.equals(contactAddress_bh)&&!contactAddress_bh.contains(contactAddress_first)&&!contactAddress_first.contains(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -63,7 +63,7 @@ public class BEH0491 extends QCCatalogue {
             findPlace = true;
         }
         //内容硬匹配
-        if (prefixText.contains("缺") || prefixText.contains("未查")) {
+        if (prefixText.contains("缺") || prefixText.contains("未查") || prefixText.contains("无")) {
             findPlace = true;
         }
         if (findTime || findPlace) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0092.java

@@ -8,6 +8,8 @@ import com.lantone.qc.pub.model.label.TreatPlanLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @ClassName : FIRC0092
  * @Description : 治疗措施不具体
@@ -31,6 +33,12 @@ public class FIRC0092 extends QCCatalogue {
         if (StringUtil.isNotBlank(text) && text.contains("护理")) {
             findText = true;
         }
+
+        Map<String,String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String structureV= structureMap.get("治疗监测计划");
+        if(StringUtil.isNotBlank(structureV) && structureV.contains("护理")){
+            findText = true;
+        }
         if ((treatPlanLabel.getNursingLevel() != null || findText) &&
                 (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0
                         || treatPlanLabel.getPacs().size() > 0)) {

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

@@ -80,6 +80,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "出生地++++出生地（住院）=出生地",
             "工作单位++++工作单位地址=工作单位",
             "婚姻状况++++婚姻=婚姻",
+            "诊疗经过++++入院诊治经过=诊疗经过",
             "联系电话=电话",
             "供史者++++病史叙述者=病史陈述者",
             "++++病史叙述者=病史陈述者",

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

@@ -241,6 +241,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
             "新会诊-会诊地点=会诊地点",
             "新会诊-接待医生=会诊医师",
             "新会诊-会诊意见=会诊意见",
+            "新会诊-会诊科室=会诊科室",
             "签名++++=签名",
             "++++会诊医师=会诊医师"
     );

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);