Merge branch 'beilun/dev-fqw' into beilun/dev

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

@@ -37,7 +37,8 @@ public class BEH0044 extends QCCatalogue {
             return;
         }
         String personalText = personalLabel.getText();
-        if (personalText.contains("详见病历") || personalText.contains("疫区") || personalText.contains("高危地区")) {
+        if (personalText.contains("详见病历") || personalText.contains("疫区") || personalText.contains("高危地区")
+                || personalText.contains("疫水") || personalText.contains("疫源") ){
             status.set("0");
             return;
         }

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

@@ -216,7 +216,9 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "患者签名时间=初步诊断日期",
             "日期=初步诊断日期",
             "骨盆外测量=专科检查",
-            "婚姻=婚姻状况"
+            "婚姻=婚姻状况",
+            "住址=户口地址",
+            "患者籍贯=出生地"
 
     );