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

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunBeHospitalizedDocTrans.java

@@ -35,7 +35,9 @@ public class BeiLunBeHospitalizedDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "联系人(关系)=联系人"
+            "联系人(关系)=联系人",
+            "入院时间=入院日期",
+            "医生签名=记录医生"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunBeHospitalizedHtmlAnalysis.java

@@ -33,8 +33,9 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
         } else {
             analysisGeneral(doc, recTitle, map);
         }
-
-        BeiLunHtmlAnalysisUtil.insertModuleId(recTypeId, map);
+        //BeiLunHtmlAnalysisUtil.insertModuleId(recTypeId, map);
+        //默认使用标准模板
+        map.put("mode_id", "402");
         return map;
     }
 
@@ -96,6 +97,7 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
                 .replace("补充专科情况", "补充专科情况：")
                 .trim();
         CommonAnalysisUtil.cutByTitles(yuText, Lists.newArrayList("专科检查", "辅助检查"), 0, map);
+
     }
 
     //24小时出入院记录、24小时出入院记录（全院）、24小时入出院记录(全院通用)、24小时内入院死亡记录(全院通用)