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

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

@@ -47,14 +47,14 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("入院记录","姓　　名","性 　 别","出生日期","出 生 地",
+            List<String> titles = Lists.newArrayList("入院记录","入院诊断","诊疗情况","姓　　名","性 　 别","出生日期","出 生 地",
                     "民　　族","现 住 址","家长姓名","联系电话","产前检查","孕 产次","孕产次","末次月经","体 格 检 查","一 般 情 况",
                     "供 史 者","入院日期","病史可靠程度","记录日期","主  诉","现病史","既往史","月经史","婚育史","月 经 史","婚 育 史","既 往 史"
                     ,"胸闷心悸史","腹痛腹泻史","多饮多尿史","浮肿少尿史","尿频尿痛史","抽  搐  史","出　血　史","食物过敏史"
                     , "药物过敏史","传染病 史","手术外伤史","输  血  史","重大疾病史和治疗史","其他","系统回顾"
                     , "个 人 史","出  生  史","喂  养  史","输  血  史","生长发育史","预防接种史","家 族 史",
                     "体格检查（一）", "一般状况","皮    肤","体格检查（二）","专科检查","营养风险筛查表","辅助检查","初步诊断",
-                    "医师签名", "日    期","修正诊断","医师签名","日   期","补充诊断","医师签名","日期","皮肤 、粘膜","产 科 检 查",
+                    "医师签名", "日    期","日   期","日 期","修正诊断","医师签名","日  期","补充诊断","医师签名","日期","皮肤 、粘膜","产 科 检 查",
                     "辅 助 检 查","营养风险筛查","个人史","婚　　姻","男友姓名","预 产 期","丈夫姓名","妇科检查","记录医师","记录时间");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles= CommonAnalysisUtil.sortTitles(titles,text);
@@ -147,7 +147,10 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "末次月经日期=末次月经",
             "入院诊断1=初步诊断",
             "记录医师=初步诊断医师签名",
-            "记录时间=初步诊断日期"
+            "病历内容=初步诊断医师签名",
+            "日期=初步诊断日期",
+            "修正诊断签名日期=修正诊断日期",
+            "修正诊断一医师签名=修正诊断医师签名"
 
     );
 

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

@@ -225,7 +225,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "记录者签名=记录医生",
             "记录日期=记录时间",
             "手术人员=手术医师",
-            "术中失血量=术中出血量",
+            "失血量=出血",
             "医师签名时间=记录时间",
             "医师签名=记录医生",
             "手术过程=手术经过及处理",

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

@@ -59,7 +59,8 @@ public class YiWuRescueDocTrans extends ModelDocTrans {
             "病情变化情况=简要病情",
             "是否成功=抢救是否成功",
             "参与抢救人员名单=参加抢救的医务人员姓名及专业技术职称",
-            "记录医师=记录医生"
+            "记录医师=记录医生",
+            "病程内容=抢救措施"
     );
 
 }