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

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

@@ -5,6 +5,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.entity.ConjugalRelation;
+import com.lantone.qc.pub.model.label.MaritalLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -37,7 +38,12 @@ public class BEH0056 extends QCCatalogue {
             status.set("0");
             return;
         }
-
+        //硬规则 匹配未婚
+        MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
+        if (maritalLabel != null && maritalLabel.getText().contains("未婚")) {
+            status.set("0");
+            return;
+        }
         ConjugalRelation conjugalRelation = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConjugalRelation();
 
         if (conjugalRelation != null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0149.java

@@ -36,7 +36,7 @@ public class LEA0149 extends QCCatalogue {
                 Map<String, String> lhStructureMap = leaveHospitalDoc.getStructureMap();
                 ChiefLabel chiefLabel = beHospitalizedDoc.getChiefLabel();
                 if (lhStructureMap != null && chiefLabel != null) {
-                    String bhChief = chiefLabel.getText().replaceAll("[\\p{Punct}\\pP。-]", "");
+                    String bhChief = chiefLabel.getText();
                     String leaveChief = lhStructureMap.get("主诉");
                     String bhThings = lhStructureMap.get("入院情况");
                     if (StringUtil.isNotBlank(bhThings)){
@@ -45,6 +45,7 @@ public class LEA0149 extends QCCatalogue {
 
                     //如果出院小结结构化数据能取出主诉，则直接用该主诉和入院记录主诉比较
                     if (StringUtil.isNotBlank(leaveChief)) {
+                        /*leaveChief = leaveChief.replaceAll("[\\p{Punct}\\pP。]", "");*/
                         leaveChief = leaveChief.replaceAll("[\\p{Punct}\\pP。-]", "");
                         if (bhChief.equals(leaveChief)) {
                             status.set("0");

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

@@ -64,10 +64,11 @@ public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
 
     private List<String> keyContrasts = Lists.newArrayList(
           "讨论日期=讨论时间",
-          "人员及专业技术职务++++专业技术职务=参加人员及职称医生",
+          "人员及专业技术职务++++专业技术职务=参加讨论者",
           "患者病情汇报=简要病情",
           "讨论结果++++主持人小结意见=结论",
-          "签名++++=签名"
+          "签名++++=签名",
+            "患者病情汇报=讨论内容"
     );
 
 }