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

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

@@ -52,7 +52,7 @@ public class YiWuDifficultCaseDiscussDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "医生=记录者",
             "讨论小结=结 论",
-            "讨论意见=讨论内容",
+            "讨论意见=讨论记录",
             "讨论日期时间=讨论日期",
             "本人姓名=姓名",
             "参加人员及职称（护士）=参加讨论者",

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

@@ -16,6 +16,7 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import org.apache.commons.lang3.StringUtils;
 
@@ -101,9 +102,26 @@ 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(), "");
+            int index = 0;
+            if(text.contains("手术开始时间")){
+                index=text.indexOf("手术开始时间")+8;
+            }
+            String timevalue=text.substring(index,index+18);
+            sourceMap.put("手术开始时间",timevalue);
+            String [] str = new String[3];
+            if(text.contains("术中诊断")){
+                str=text.split("术中诊断");
+            }
+            sourceMap.put("术中诊断",str[1]);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts, modeId);
+
         }
 
         OperationDiscussionDoc operationDiscussionDoc = new OperationDiscussionDoc();
@@ -119,7 +137,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "结束时间=手术结束时间",
             "书写日期=记录日期",
             "注意事项=术后注意事项",
-            "治疗计划和措施=术后处理措施"
+            "治疗计划和措施=术后处理措施",
+            "术后注意观察事项=注意事项",
+            "手术方式=手术名称方式",
+            "手术简要经过(包括术中所见)=手术简要经过"
     );
 
 
@@ -152,6 +173,12 @@ 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, operationRecord_keyContrasts, modeId);
@@ -165,10 +192,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
 
     // 手术记录
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
-            "结束时间=手术结束时间",
-            "开始时间=手术开始时间",
+            /*"结束时间=手术结束时间",
+            "开始时间=手术开始时间",*/
             "医生=主刀医师签名",
-            "手术医师=主刀医师",
             "助手=一助",
             "本人姓名=姓名",
             "手术开始日期时间=开始时间",
@@ -176,7 +202,16 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "术后诊断=术中后诊断",
             "麻醉方法代码=麻醉方式",
             "麻醉医师签名=麻醉医师",
-            "手术过程的详细描述=手术经过及处理"
+            "手术过程的详细描述=手术经过及处理",
+            "手术开始时间=开始时间",
+            "手术结束时间=结束时间",
+            "主刀医师=手术医师",
+            "手术中用药=手术中用药化疗等药物",
+            "术后送检病理无有标本件数=标本件数",
+            "出血量=出血",
+            "输血量=",
+            "输血量=",
+            "输血量="
     );
 
 
@@ -226,7 +261,6 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
             "参加人员及职称=参加人员",
             "主刀医师=主刀医师签名",
-            "术前准备=术前准备内容",
             "注意事项=术前术后注意事项",
             "其他术前相关情况=术前术后注意事项",
             "辅助检查结果=辅助检查",
@@ -243,7 +277,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "讨论日期时间=讨论时间",
             "参加人员及技术职称=参加人员",
             "主持人姓名=讨论主持人",
-            "拟施手术名称和方式及可能的变更=拟施手术方式、名称及可能的变更与禁忌症"
+            "拟施手术名称和方式及可能的变更=拟施手术方式、名称及可能的变更与禁忌症",
+            "术前准备内容=术前准备"
     );
 
     /**********************************************手术知情同意书****************************************************/