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

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanLeaveHospitalDocTrans.java

@@ -36,7 +36,7 @@ public class QiYuanLeaveHospitalDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = QiYuanXmlUtil.xmlToMap(content);
             List<String> titles = Lists.newArrayList("姓名","性别","年龄","住院天数","入院日期","出院日期","入院时间", "出院时间",
                     "住院数", "住院天数", "入院诊断", "出院诊断", "出院诊断", "入院情况","诊疗经过", "住院经过", "出院情况",
-                    "出院医嘱", "医师签名", "签名时间", "主诉", "诊疗过程", "医师签名时间");
+                    "出院医嘱", "医师签名", "签名日期", "主诉", "诊疗过程", "医师签名时间");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -86,7 +86,9 @@ public class QiYuanLeaveHospitalDocTrans extends ModelDocTrans {
             "患者签名日期=记录时间",
             "医师签名=记录医生",
             "签名时间=记录时间",
-            "住院天数1=住院天数"
+            "住院天数1=住院天数",
+            "诊疗经过=诊治经过",
+            "疗效评价=治疗结果"
     );