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

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

@@ -90,7 +90,6 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "一般健康状况=既往健康状况",
             "婚姻家庭关系和睦=夫妻关系",
             "体格检查=体格检查",
-            "专科检查=专科体格检查",
             "初步诊断=初步诊断",
             "修正诊断=修正诊断",
             "医生=医师签名",

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

@@ -50,10 +50,12 @@ public class YiWuClinicalBloodDocTrans extends ModelDocTrans {
 
     private List<String> keyContrasts = Lists.newArrayList(
             "开始时间=输注开始",
-            "医生=记录医师",
+            "医生=记录医生",
+            "记录医师=记录医生",
             "结束时间=输注结束",
             "病历日期=记录时间",
-            "内容=输注后效果评价"
+            "内容=输注后效果评价",
+            "病程内容=病情记录"
     );
 
 }

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

@@ -54,7 +54,11 @@ public class YiWuLeaveHospitalDocTrans extends ModelDocTrans {
             "主诉=入院情况",
             "诊疗过程=诊治经过",
             "医师签名时间=记录时间",
-            "出院时间=出院日期"
+            "出院时间=出院日期",
+            "初步诊断=入院诊断",
+            "住院经过=诊治经过",
+            "患者签名日期=记录时间",
+            "医师签名=记录医生"
     );
 
 }

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

@@ -116,10 +116,12 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             String timevalue=text.substring(index,index+18);
             sourceMap.put("手术开始时间",timevalue);
             String [] str = new String[3];
+            String s="";
             if(text.contains("术中诊断")){
                 str=text.split("术中诊断");
+                s=str[1].replace(":","");
             }
-            sourceMap.put("术中诊断",str[1]);
+            sourceMap.put("术中诊断",s);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts, modeId);
 
         }
@@ -277,11 +279,11 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "现病史- 发病情况=发病经过",
             "本人姓名=姓名",
             "拟施手术名称和方式=拟行术式",
+            "手术名称=拟行术式",
             "拟实施麻醉方法代码=拟施麻醉方式",
             "拟实施手术及操作名称=拟施手术方式、名称及可能的变更与禁忌症",
             "术前术后注意事项=主要术中、术后风险及防范措施",
             "时间=讨论时间",
-            "术前准备内容=术前准备",
             "手术指征与禁忌症=手术指征与禁忌",
             "讨论日期时间=讨论时间",
             "讨论日期=讨论时间",

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

@@ -50,9 +50,16 @@ public class YiWuRescueDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "事件日期=抢救开始时间",
+            "事件日期=开始时间",
             "抢救病情=病情变化",
-            "本人姓名=姓名"
+            "本人姓名=姓名",
+            "抢救结束日期=结束时间",
+            "抢救开始日期=开始时间",
+            "抢救经过与措施=抢救措施",
+            "病情变化情况=简要病情",
+            "是否成功=抢救是否成功",
+            "参与抢救人员名单=参加抢救的医务人员姓名及专业技术职称",
+            "记录医师=记录医生"
     );
 
 }