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

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

@@ -124,7 +124,8 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "病史提供者=病史陈述者",
             "家庭地址=户口地址",
             "患者手机号码=联系电话",
-            "入院诊断=初步诊断"
+            "入院诊断=初步诊断",
+            "病历内容=个人史"
 
     );
 

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

@@ -42,16 +42,19 @@ public class YiWuLeaveHospitalDocTrans extends ModelDocTrans {
 
     private List<String> keyContrasts = Lists.newArrayList(
             "本人姓名=姓名",
-            "入院日期=入院时间",
             "实际住院天数=住院天数",
             "出院时情况=出院情况",
             //            "注意事项=健康教育",
             "复诊时间=随访计划",
             "出院指导=健康教育",
-            "医生=医师签名",
-            "病历日期=签名时间",
+            "医生=记录医生",
+            "医师签名=记录医生",
+            "病历日期=记录时间",
             "体温(耳)=体温耳",
-            "主诉=入院情况"
+            "主诉=入院情况",
+            "诊疗过程=诊治经过",
+            "医师签名时间=记录时间",
+            "出院时间=出院日期"
     );
 
 }

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

@@ -133,14 +133,16 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
 
     private List<String> operationDiscussion_keyContrasts = Lists.newArrayList(
             "本人姓名=姓名",
-            "开始时间=手术开始时间",
-            "结束时间=手术结束时间",
             "书写日期=记录日期",
             "注意事项=术后注意事项",
-            "治疗计划和措施=术后处理措施",
-            "术后注意观察事项=注意事项",
+            "治疗计划和措施=术后诊疗计划处理措施",
+            "术后注意观察事项=术后注意事项",
             "手术方式=手术名称方式",
-            "手术简要经过(包括术中所见)=手术简要经过"
+            "手术简要经过（包括术中所见）=手术简要经过",
+            "术中诊断=术中后诊断",
+            "术后诊疗计划（处理措施）=术后诊疗计划处理措施"
+
+
     );
 
 
@@ -176,7 +178,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             List<String> titles = Lists.newArrayList("手术开始时间","手术结束时间","术前诊断","术（中）后诊断",
                     "手术名称","手术医师","助手医师","麻醉方式",
                     "麻醉医师","手术护士","巡回护士","手术中用药（化疗等药物）","手术切口类别（可选）","术中出血量","输血量"
-                    ,"围术期并发症","手术切除标本","标本件数","是否有植入物","手术步骤");
+                    ,"围术期并发症","手术切除标本","冰冻切片结果","标本件数","是否有植入物","手术步骤");
             String text = sourceMap.get("原始文本");
             CommonAnalysisUtil.cutByTitles(text,titles,0,sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
@@ -209,9 +211,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术中用药=手术中用药化疗等药物",
             "术后送检病理无有标本件数=标本件数",
             "出血量=出血",
-            "输血量=",
-            "输血量=",
-            "输血量="
+            "是否有植入物=是否术中植入物",
+            "手术切口类别（可选）=切口类别",
+            "手术步骤=手术经过及处理"
     );
 
 
@@ -244,6 +246,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            List<String> titles = Lists.newArrayList("讨论时间","讨论地点","主持人","经治医师",
+                    "参加人员及技术职称","讨论方式","讨论记录");
+            String text = sourceMap.get("原始文本");
+            CommonAnalysisUtil.cutByTitles(text,titles,0,sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);
@@ -275,10 +281,14 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "术前准备内容=术前准备",
             "手术指征与禁忌症=手术指征与禁忌",
             "讨论日期时间=讨论时间",
+            "讨论日期=讨论时间",
             "参加人员及技术职称=参加人员",
             "主持人姓名=讨论主持人",
             "拟施手术名称和方式及可能的变更=拟施手术方式、名称及可能的变更与禁忌症",
-            "术前准备内容=术前准备"
+            "术前准备内容=术前准备",
+            "经治医师=手术者签名",
+            "记录人签名=记录医生",
+            "讨论记录=讨论意见"
     );
 
     /**********************************************手术知情同意书****************************************************/