义乌性别与病历描述不符和父母健康情况未描述规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH02966.java

@@ -34,7 +34,7 @@ public class BEH02966 extends QCCatalogue {
         List<String> noMatchWords = null;
         if (gender.contains("男")) {
             /* 男性不合理词 */
-            noMatchWords = Lists.newArrayList("阴道", "宫颈", "子宫", "宫底", "胎位", "胎数", "胎心",
+            noMatchWords = Lists.newArrayList("阴道", "宫颈","宫底", "胎位", "胎数", "胎心",
                     "宫缩", "宫口", "输卵管", "卵巢", "输卵管", "阴唇", "阴蒂", "阴道前庭", "前庭大腺", "处女膜");
         } else if (gender.contains("女")) {
             /* 女性不合理词 */

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0397.java

@@ -54,8 +54,12 @@ public class BEH0397 extends QCCatalogue {
         if (StringUtil.isNotBlank(familyText)){
             familyText = StringUtil.removeBlank(familyText);
         }
-        if ((StringUtil.isNotBlank(familyText) && (familyText.contains("父母") || familyText.contains("详见原病历") || familyText.contains("双亲") || familyText.contains("已故")))
-                || (StringUtil.isNotBlank(maritalText) && (maritalText.contains("父母") || maritalText.contains("详见原病历") || familyText.contains("双亲") || familyText.contains("已故")))) {
+        if ((StringUtil.isNotBlank(familyText) && (familyText.contains("父母") ||
+                familyText.contains("详见原病历") || familyText.contains("双亲") ||
+                familyText.contains("已故")  || familyText.contains("父亲") ||familyText.contains("母亲")))
+                || (StringUtil.isNotBlank(maritalText) && (maritalText.contains("父母") ||
+                maritalText.contains("详见原病历") || familyText.contains("双亲") || familyText.contains("已故")
+                || familyText.contains("父亲") ||familyText.contains("母亲")))) {
             status.set("0");
             return;
         }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -109,7 +109,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                         replaceAll("签名时间","");
                 structureMap.put("补充诊断",value);
             }
-            if(structureMap.containsKey("初步诊断")){
+            if(structureMap.containsKey("初步诊断医师签名")){
                 String value=structureMap.get("初步诊断").replaceAll("日期","").
                         replaceAll(":","");
                 structureMap.put("初步诊断",value);