长兴相关bug修改

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

@@ -25,6 +25,12 @@ public class BEH0053 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //未婚未育不判断
+        if(beHospitalizedDoc.getMaritalLabel().getText().contains("未婚")
+                || beHospitalizedDoc.getMaritalLabel().getText().contains("未婚")){
+            status.set("0");
+            return;
+        }
         //先取一次结构化数据
         Map<String, String> beHospitalizedStructureMap = beHospitalizedDoc.getStructureMap();
         String marryiAgeStr = beHospitalizedStructureMap.get("结婚年龄");

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

@@ -21,6 +21,12 @@ public class BEH0054 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //未婚未育不判断
+        if(inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("未婚")
+                || inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("未婚")){
+            status.set("0");
+            return;
+        }
         Consanguineous consanguineous = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConsanguineous();
         if (consanguineous != null && StringUtil.isNotBlank(consanguineous.getName())) {
             status.set("0");

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

@@ -54,7 +54,9 @@ public class BEH0056 extends QCCatalogue {
             }
         }
         //硬规则 匹配离婚
-        if (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("离婚")) {
+        if (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("离婚")
+                || inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("未婚")
+                || inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("未育")) {
             status.set("0");
         }
     }

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

@@ -40,7 +40,12 @@ public class BEH0058 extends QCCatalogue {
         if (ListUtil.isNotEmpty(familiesMl)) {
             familyList.addAll(familiesMl);
         }
-
+        //未婚未育不判断
+        if(beHospitalizedDoc.getMaritalLabel().getText().contains("未婚")
+                || beHospitalizedDoc.getMaritalLabel().getText().contains("未婚")){
+            status.set("0");
+            return;
+        }
         Pattern p = Pattern.compile("[儿子女]");
         if (StringUtil.isNotBlank(familyMembersHealth)){
             if (p.matcher(familyMembersHealth).find()){

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * @ClassName : BEH0072
- * @Description : 家属有死亡者,未记录死亡原因及年龄
+ * @Description : 家属有死亡者,未记录死亡原因
  * @Author : 胡敬
  * @Date: 2020-03-11 16:44
  */
@@ -32,6 +32,9 @@ public class BEH0072 extends QCCatalogue {
             for (Family family : families) {
                 if (family.getDead() != null) {
                     Dead dead = family.getDead();
+                    if(family.getName().contains("年迈")){
+                        continue;
+                    }
                     if (dead.getDeadReason() != null || dead.getUnknow() != null) {
                         return;
                     } else {

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

@@ -29,6 +29,12 @@ public class BEH0375 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //未婚未育不判断
+        if(inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("未婚")
+                || inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("未婚")){
+            status.set("0");
+            return;
+        }
         //台州市结构化的
         Map<String, String> structureMap_beh = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(StringUtils.isNotEmpty(structureMap_beh.get("配偶健康状况"))){

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

@@ -48,6 +48,12 @@ public class BEH0376 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //未婚未育不判断
+        if (maritalLabel.getText().contains("未婚")
+                || maritalLabel.getText().contains("未育")) {
+            status.set("0");
+            return;
+        }
         List<Family> familyList = Lists.newArrayList();
         List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
         List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();

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

@@ -34,7 +34,11 @@ public class BEH0398 extends QCCatalogue {
             status.set("0");
             return;
         }
-
+        //独生子不做判断
+        if(inputInfo.getBeHospitalizedDoc().getFamilyLabel().getText().contains("独生子")){
+            status.set("0");
+            return;
+        }
         List<Family> familyList = Lists.newArrayList();
         List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
         List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();

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

@@ -98,12 +98,15 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
         return consultationRecordDoc;
     }
 
-    private List<String> consultationRecord_sourceTitles = Lists.newArrayList();
+    private List<String> consultationRecord_sourceTitles = Lists.newArrayList(
+            "医师签名"
+    );
 
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
             "执行情况=会诊情况",
             "记录日期=会诊申请日期",
-            "签名++++=签名"
+            "签名++++=签名",
+            "医师签名=签名"
     );