Merge remote-tracking branch 'origin/beilun/dev-fqw' into beilun/dev

# Conflicts:
#	trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

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

@@ -72,18 +72,16 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "职业=职业",
             "出生地址=出生地",
             "出生、生长史=出生生长史",
-//            "婚姻状况=婚姻",
             "地址=联系地址",
             "工作场所=工作单位",
             "信息来源=病史陈述者",
-            "供史者=病史陈述者",
             "生日=出生日期",
             "出生时间=出生日期",
             "病人出生日期=出生日期",
             "新生儿出生日期=出生日期",
             //            "出生地址=户口地址",
             "本人电话=电话",
-//            "联系电话=联系人电话",
+            "联系电话=联系人电话",
             "入院日期=入院日期",
             "入病房时间=入院日期",
             "病历日期=记录日期",
@@ -109,8 +107,12 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "联系人电话号码=联系电话",
             "家长姓名=联系人",
             "患者出生地址=出生地",
-            "联系人姓名=联系人",
-            "医师签名=记录医师"
+            "入院日期时间=入院日期",
+            "现住址=户口地址",
+            "_{k4}=性别",
+            "联系住址=户口地址",
+            "联系地址=户口地址",
+            "出生日期时间=出生日期"
 
     );