Ver código fonte

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

fangqw 4 anos atrás
pai
commit
4ff9ffa26f

+ 7 - 4
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -140,7 +140,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术方式=手术名称方式",
             "手术简要经过(包括术中所见)=手术简要经过",
             "术中诊断=术中后诊断",
-            "术后诊疗计划(处理措施)=术后诊疗计划处理措施"
+            "术后诊疗计划(处理措施)=术后诊疗计划处理措施",
+            "手术开始时间=开始时间"
 
 
     );
@@ -178,7 +179,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(), "");
@@ -213,7 +214,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "出血量=出血",
             "是否有植入物=是否术中植入物",
             "手术切口类别(可选)=切口类别",
-            "手术步骤=手术经过及处理"
+            "手术步骤=手术经过及处理",
+            "记录者签名=记录医生",
+            "记录日期=记录时间"
     );
 
 
@@ -247,7 +250,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
         } 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(), "");