Merge remote-tracking branch 'origin/dev-1.2' into dev-1.2

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfBeHospitalizedDocTrans.java

@@ -63,8 +63,10 @@ public class ShaoyfBeHospitalizedDocTrans extends ModelDocTrans {
             "出生、生长史=出生生长史",
             "婚姻状况=婚姻",
             "地址=联系地址",
+            "现住址=联系地址",
             "工作场所=工作单位",
             "信息来源=病史陈述者",
+            "病史可靠程度=病史可靠性",
             "生日=出生日期",
             "出生时间=出生日期",
             "病人出生日期=出生日期",
@@ -74,6 +76,7 @@ public class ShaoyfBeHospitalizedDocTrans extends ModelDocTrans {
             "联系电话=联系人电话",
             "入院日期=入院日期",
             "入病房时间=入院日期",
+            "入院日期时间=入院日期",
             "病历日期=记录日期",
             "主诉=主诉",
             "现病史=现病史",
@@ -83,6 +86,8 @@ public class ShaoyfBeHospitalizedDocTrans extends ModelDocTrans {
             "专科检查=专科体格检查",
             "初步诊断=初步诊断",
             "修正诊断=修正诊断",
+            "当前诊断=死亡诊断",
+            "喂养间隔=间隔时间",
             "医生=医师签名",
             "补充诊断=补充诊断",
             "户口地址=联系地址",
@@ -90,7 +95,9 @@ public class ShaoyfBeHospitalizedDocTrans extends ModelDocTrans {
             "家属提供的信息可信吗=病史可靠性",
             "入院诊断(中医疾病)=中医诊断",
             "长期用药情况(包括可能成瘾的药物)=长期用药",
-            "体温(口)=体温"
+            "体温(口)=体温",
+            "常规产前检查=产前检查",
+            "复诊科室=科别"
     );
 
 

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfFirstCourseRecordDocTrans.java

@@ -30,8 +30,9 @@ public class ShaoyfFirstCourseRecordDocTrans extends ModelDocTrans {
         Map<String, String> sourceMap = ShaoyfXmlUtil.getXmlToMap(content);
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-
-        sourceMap.put("主诊医生", sourceMap.get("主诊医生").replace("&amp;amp;nbsp;", ""));
+        if (sourceMap.get("主诊医生") != null) {
+            sourceMap.put("主诊医生", sourceMap.get("主诊医生").replace("&amp;amp;nbsp;", ""));
+        }
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         // 病例特点=主诉+现病史-发病情况+专科检查+实验室检查+影像学检查+辅助检查结果+呼吸+脉搏+体温+血压
         //        structureMap.put("病例特点", MapUtil.getSelectString(structureMap, Arrays.asList(

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfOperationDocTrans.java

@@ -106,6 +106,8 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
 
     private List<String> operationDiscussion_keyContrasts = Lists.newArrayList(
             "本人姓名=姓名",
+            "当前诊断=术前诊断",
+            "术中发现=术中诊断",
             "开始时间=手术开始时间",
             "结束时间=手术结束时间"
     );
@@ -152,6 +154,7 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
             "手术医师=主刀医师",
             "助手=一助",
             "助手II=二助",
+            "补救措施1=补救措施",
             "本人姓名=姓名"
     );
 

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfTransferRecordDocTrans.java

@@ -156,6 +156,10 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
     private List<String> transferInto_keyContrasts = Lists.newArrayList(
             "书写日期=病历日期",
             "转科目的=转科原因",
+            "入ICU前诊治经过=诊治经过",
+            "辅助检查=辅助检查结果",
+            "治疗计划=治疗计划和措施",
+            "书写内容=转运途中情况",
             "本人姓名=姓名"
     );