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

kernel/src/main/java/com/lantone/qc/kernel/util/CacheFileManager.java

@@ -27,7 +27,7 @@ public class CacheFileManager {
     private String password;
     private String url;
 
-    private static String hospitalId = "3";
+    private static String hospitalId = "2";
 
     private String path = "";
 

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

@@ -37,6 +37,7 @@ public class ShaoyfDeathCaseDiscussDocTrans extends ModelDocTrans {
             "主持人=讨论主持人",
             "死亡日期=死亡时间",
             "讨论意见=讨论内容",
+            "事件日期=讨论日期",
             "现病史- 发病情况=入院情况",
             "医生=记录医师",
             "本人姓名=姓名"

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

@@ -30,6 +30,8 @@ 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;", ""));
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         // 病例特点=主诉+现病史-发病情况+专科检查+实验室检查+影像学检查+辅助检查结果+呼吸+脉搏+体温+血压
         //        structureMap.put("病例特点", MapUtil.getSelectString(structureMap, Arrays.asList(
@@ -80,6 +82,7 @@ public class ShaoyfFirstCourseRecordDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
                         "本人姓名=姓名",
             "现病史- 发病情况=发病经过",
+            "入院原因=主诉",
             "医生=医师签名",
             "治疗计划和措施=治疗计划",
             "体温(耳)=体温耳",

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

@@ -151,6 +151,7 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
             "开始时间=手术开始时间",
             "手术医师=主刀医师",
             "助手=一助",
+            "助手II=二助",
             "本人姓名=姓名"
     );
 

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

@@ -154,7 +154,8 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> transferInto_keyContrasts = Lists.newArrayList(
-            "书写日期=记录日期",
+            "书写日期=病历日期",
+            "转科目的=转科原因",
             "本人姓名=姓名"
     );
 
@@ -227,7 +228,8 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> transferOut_keyContrasts = Lists.newArrayList(
-            "书写日期=记录日期",
+            "书写日期=病历日期",
+            "转科目的=转科原因",
             "本人姓名=姓名"
     );