余杭三院：进一步解析

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyBeHospitalizedDocTrans.java

@@ -68,7 +68,6 @@ public class YuhangsyBeHospitalizedDocTrans extends ModelDocTrans {
             "医师签名=记录医生",
             "产科专科检查一般状况=专科检查",
             "补充及专科情况体温=专科检查",
-            "实验室检查=辅助检查",
             "民族\\宗教=民族"
     );
 

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyConsultationDocTrans.java

@@ -117,7 +117,8 @@ public class YuhangsyConsultationDocTrans extends ModelDocTrans {
 
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
             "会诊原因=会诊目的",
-            "医师会诊意见=会诊意见"
+            "医师会诊意见=简要病情",
+            "记录医师=记录医生"
     );
 
 

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyCrisisValueReportDocTrans.java

@@ -66,9 +66,8 @@ public class YuhangsyCrisisValueReportDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "病历标题=标题",
-            "记录医师=医师签名",
-            "病情记录=病历内容"
+            "记录医师=记录医生",
+            "病情记录=病情分析及处理"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyCriticallyIllNoticeDocTrans.java

@@ -71,7 +71,14 @@ public class YuhangsyCriticallyIllNoticeDocTrans extends ModelDocTrans {
             "患者姓名=姓名",
             "现在我院=科别",
             "医护人员签名签名日期=医生签名时间",
-            "目前诊断为=当前诊断"
+            "目前诊断为=当前诊断",
+            "签名日期=病历日期",
+            "患者家属或患者的法定监护人、授权委托人意见：=患方意见",
+            "患者家属或患者的法定监护人意见：=患方意见",
+            "患者监护人签名=患者签名",
+            "患者授权亲属签名=患者签名",
+            "医护人员签名=告知医师签名",
+            "签名日期=患者签名时间"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyDeathCaseDiscussDocTrans.java

@@ -55,14 +55,13 @@ public class YuhangsyDeathCaseDiscussDocTrans extends ModelDocTrans {
 
     private List<String> keyContrasts = Lists.newArrayList(
             "患者姓名=姓名",
-            "病情摘要=病史简介",
-            "讨论日期=讨论时间",
-            "死亡主持人签名=主持人",
             "参加讨论人员（注明职称、职务）=参加人员",
+            "病情摘要=病史简介",
+            "汇报病情=病史简介",
             "讨论意见（对诊断、治疗、抢救的意见，死亡原因分析及经验教训等的记录）=讨论内容",
-            "记录者签名=记录医生",
-            "记录者签名日期=记录时间",
-            "总结=主持人小结"
+            "主持人小结意见=主持人小结",
+            "签名日期=记录时间",
+            "记录者签名=记录医生"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyDeathRecordDocTrans.java

@@ -56,12 +56,18 @@ public class YuhangsyDeathRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
+            //死亡记录
+            "住址=家庭住址",
             "入院时情况（简要病史、阳性体征、有关实验室及器械检查结果）=入院情况",
             "住院经过及抢救经过=诊疗经过",
+            "实验室及器械检查结果=医技检查",
             "尸体病理解剖情况=尸检",
-            "实验室检查=医技检查",
-            "实验室检查=医技检查",
-            "记录医师=记录医生"
+            "记录医师=记录医生",
+
+            //死亡记录（新）
+            "死亡时间=死亡日期",
+            "医师签名=记录医生",
+            "时间=记录时间"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyDifficultCaseDiscussDocTrans.java

@@ -83,7 +83,7 @@ public class YuhangsyDifficultCaseDiscussDocTrans extends ModelDocTrans {
 
     private List<String> keyContrasts = Lists.newArrayList(
             "病历记录时间=记录时间",
-            "记录医师=记录医生签名",
+            "记录医师=记录医生",
             "病程内容=汇报病史"
     );
 

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyLeaveHospitalDocTrans.java

@@ -66,10 +66,11 @@ public class YuhangsyLeaveHospitalDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "入院时间=入院日期",
             "出院时间=出院日期",
-            "入院情况=病史摘要",
+            "疗效评价=治疗结果",
             "住院经过=诊治经过",
-            "签名时间=时间",
-            "入院查体=主要实验室检查及器械检验结果"
+            "出院指导=出院计划",
+            "医师签名=记录医生",
+            "签名时间=记录时间"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyOperationDocTrans.java

@@ -130,10 +130,9 @@ public class YuhangsyOperationDocTrans extends ModelDocTrans {
     }
 
     private List<String> operationDiscussion_keyContrasts = Lists.newArrayList(
-            "病历日期=病历日期",
             "病历标题=标题",
-            "病情记录=术后注意事项",
-            "记录医生=记录医生"
+            "病情记录=病程内容",
+            "记录医师=记录医生"
     );
 
 
@@ -206,8 +205,6 @@ public class YuhangsyOperationDocTrans extends ModelDocTrans {
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
             "手术开始时间=开始时间",
             "术中诊断=术中后诊断",
-//            "麻醉医师=麻醉者",
-//            "麻醉方式=麻醉方法",
             "记录医师=记录医生",
             "记录医师签名时间=记录时间",
             "手术过程=手术经过及处理"
@@ -252,13 +249,7 @@ public class YuhangsyOperationDocTrans extends ModelDocTrans {
             YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyPreoperativeHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
-                if (StringUtil.isNotBlank(sourceMap.get("文书标题")) && sourceMap.get("文书标题").equals("术前小结")) {
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts2);
-                } else {
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
-                }
-
-
+                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
                 structureMap.put("记录编号", contentMap.get("recId").toString());
                 structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
             }
@@ -304,15 +295,42 @@ public class YuhangsyOperationDocTrans extends ModelDocTrans {
     }
 
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
-            "讨论时间=文书时间",
-            "讨论方式=病历内容",
-            "主刀医生签名=记录医生"
-    );
-    private List<String> preoperativeDiscussion_keyContrasts2 = Lists.newArrayList(
-            "病史摘要=病历内容",
-            "医生签名=记录医生",
-            "日期=文书时间"
-
+            //术前讨论术前小结
+            "参加人员的姓名及专业技术职务=参加人员",
+            "一、简要病情=简要病情",
+            "1、术前诊断=术前诊断",
+            "2、手术指征与禁忌症=手术指征",
+            "3、可替代方案=可替代的方案",
+            "4、拟施手术方式（名称）及可能的变更方案=拟施手术名称及方式",
+            "5、计划性多次手术=计划性多次手术",
+            "6、拟施麻醉方式=拟施麻醉方式",
+            "7、术前准备=术前准备",
+            "8、主要术中、术后风险及防范措施=风险及防范措施",
+            "9、术中、术后注意事项（含护理事项）=术中术后注意事项",
+            "11、主持人小结=讨论结论",
+            "主刀医生签名=医生签名",
+            "经治医师签名=医生签名",
+            "签字时间=记录时间",
+
+
+            //杭州市余杭区第三人民医院术前讨论
+            "时间=讨论时间",
+            "诊断依据=简要病情",
+            "手术适应症=手术指征",
+            "拟定手术方式=拟施手术名称及方式",
+            "拟定麻醉方式=拟施麻醉方式",
+            "术中、术后可能发生的意外=术中术后注意事项",
+            "防范措施=风险及防范措施",
+            "科室讨论意见=具体讨论意见",
+            "讨论结果=讨论结论",
+            "记录医师=医生签名",
+
+            //术前小结
+            "病史摘要=简要病情",
+            "拟施手术=拟施手术名称及方式",
+            "拟施麻醉=拟施麻醉方式",
+            "术中注意点=术中、术后注意事项",
+            "日期=记录时间"
     );
 
     /**********************************************手术知情同意书****************************************************/

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyRescueDocTrans.java

@@ -68,6 +68,7 @@ public class YuhangsyRescueDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "病历标题=标题",
             "病情记录=抢救内容",
+            "医师签名=记录医生",
             "记录医师=记录医生"
     );
 

trans/src/main/java/com/lantone/qc/trans/yuhangsy/YuhangsyStagesSummaryDocTrans.java

@@ -68,7 +68,7 @@ public class YuhangsyStagesSummaryDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "记录医师=记录医生",
             "病历标题=标题",
-            "病情记录=目前病情"
+            "病情记录=病历内容"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/util/YuhangsyBeHospitalizedHtmlAnalysis.java

@@ -74,6 +74,11 @@ public class YuhangsyBeHospitalizedHtmlAnalysis implements YuhangsyHtmlAnalysis
         if(StringUtil.isNotBlank(structureMap.get("补充及专科情况体温"))){
             structureMap.put("补充及专科情况体温", "体温:"+structureMap.get("补充及专科情况体温"));
         }
+        //如果修正诊断带有医师签名
+        if(StringUtil.isNotBlank(structureMap.get("修正诊断"))&& structureMap.get("修正诊断").contains("医师签名")){
+            Integer index = structureMap.get("修正诊断").indexOf("医师签名");
+            structureMap.put("修正诊断", structureMap.get("修正诊断").substring(0,index));
+        }
     }
 
     //24小时出入院记录、24小时出入院记录（全院）、24小时入出院记录(全院通用)、24小时内入院死亡记录(全院通用)

trans/src/main/java/com/lantone/qc/trans/yuhangsy/util/YuhangsyDeathCaseDiscussHtmlAnalysis.java

@@ -31,9 +31,9 @@ public class YuhangsyDeathCaseDiscussHtmlAnalysis implements YuhangsyHtmlAnalysi
             String recTypeId = args[2];
             List<String> titles = Lists.newArrayList(
                     "患者姓名", "性别", "年龄", "婚姻", "出生地", "职业", "工作单位", "住址", "入院日期", "死亡日期", "讨论日期", "入院诊断", "死亡诊断",
-                    "参加讨论人员（注明职称、职务）",
-                    "病情摘要", "入科查体", "转入诊断", "讨论意见（对诊断、治疗、抢救的意见，死亡原因分析及经验教训等的记录）","总结",
-                    "死亡原因", "死亡主持人签名", "签名日期", "记录者签名"
+                    "参加讨论人员（注明职称、职务）", "病情摘要","汇报病情",
+                    "讨论意见（对诊断、治疗、抢救的意见，死亡原因分析及经验教训等的记录）","主持人小结意见",
+                    "死亡原因","主持人签名","签名日期", "记录者签名"
             );
             String htmlContent = YuhangsyCommonAnalysisUtil.html2String(html);
 
@@ -74,6 +74,10 @@ public class YuhangsyDeathCaseDiscussHtmlAnalysis implements YuhangsyHtmlAnalysi
                 map.put("记录者签名日期", name.substring(name.indexOf("签名日期：")));
             }
         }
+        //主持人从主持人签名中提取
+        if (map.containsKey("主持人签名")) {
+            map.put("主持人", map.get("记录者签名"));
+        }
     }
 
 }

trans/src/main/java/com/lantone/qc/trans/yuhangsy/util/YuhangsyDeathRecordHtmlAnalysis.java

@@ -33,18 +33,23 @@ public class YuhangsyDeathRecordHtmlAnalysis implements YuhangsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             List<String> titles = Lists.newArrayList(
-                    "姓名", "性别", "年龄", "婚姻", "职业", "民族", "工作单位", "住址", "入院日期", "入院诊断", "手术日期", "手术名称", "死亡日期", "住院天数", "死亡诊断",
-                    "入院时情况（简要病史、阳性体征、有关实验室及器械检查结果）", "实验室检查", "特殊检查", "住院经过及抢救经过", "死亡原因", "尸体病理解剖情况", "X线片号", "病理检验号",
-                    "主治医师签名", "科主任（副主任医师以上）", "医师签名"
+                    //死亡记录
+                    "姓名", "性别", "年龄", "婚姻", "职业", "民族", "工作单位", "住址",
+                    "入院日期", "入院诊断", "手术日期", "手术名称", "死亡日期", "住院天数", "死亡诊断",
+                    "入院时情况（简要病史、阳性体征、有关实验室及器械检查结果）", "主诉", "现病史", "实验室及器械检查结果","住院经过及抢救经过",
+                    "死亡原因", "尸体病理解剖情况", "X线片号", "病理检验号",
+                    "科主任（副主任医师以上）", "主治医师签名", "医师签名",
+
+                    //死亡记录（新）
+                    "入院时间","死亡时间","入院情况","入院诊断","诊疗经过","死亡原因","死亡诊断","医师签名","时间"
             );
             String htmlContent = YuhangsyCommonAnalysisUtil.html2String(html);
 
             if (StringUtil.isNotBlank(htmlContent)) {
                 YuhangsyCommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
             }
-            // 解决时间显示 年 月 日 时
+            // 解决时间显示 年 月 日 时 分
             YuhangsyCommonAnalysisUtil.signatureTime1("时间", structureMap);
-            YuhangsyCommonAnalysisUtil.signatureTime1("日 期", structureMap);
             YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);

trans/src/main/java/com/lantone/qc/trans/yuhangsy/util/YuhangsyLeaveHospitalHtmlAnalysis.java

@@ -27,9 +27,9 @@ public class YuhangsyLeaveHospitalHtmlAnalysis implements YuhangsyHtmlAnalysis {
     public Map<String, String> analysis(String... args) {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
-            List<String> titles = Lists.newArrayList("入院时间", "出院时间", "住院天数", "入院诊断",
-                    "出院诊断","主 诉", "入院情况", "入院查体", "住院经过", "出院情况", "出院医嘱","查体",
-                    "患者或患者授权亲属签名", "医师签名", "签名时间","日 期","出院指导"
+            List<String> titles = Lists.newArrayList("入院时间", "出院时间", "住院天数","疗效评价", "入院诊断",
+                    "出院诊断", "入院情况", "住院经过", "出院情况", "出院医嘱","出院指导",
+                    "患者或患者授权亲属签名", "医师签名", "签名时间"
             );
             String html = args[0];
             String recTitle = args[1];

trans/src/main/java/com/lantone/qc/trans/yuhangsy/util/YuhangsyPreoperativeHtmlAnalysis.java

@@ -30,12 +30,22 @@ public class YuhangsyPreoperativeHtmlAnalysis implements YuhangsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             List<String> titles = Lists.newArrayList(
-//                    "讨论时间", "讨论方式", "参加人员的姓名及专业技术职务", "参加人员",
-//                    "简要病情", "入院查体", "术前诊断", "手术指征与禁忌症", "可替代方案", "拟施手术方式（名称）及可能的变更方案", "计划性多次手术", "拟麻醉方式", "拟施麻醉方式", "术前准备", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）", "围术期预防性抗菌药使用",
-//                    "主刀医生签名", "分标记医生签名", "经治医师签名", "分主刀医师签名",
-                    "讨论时间","讨论方式","主刀医生签名", "分标记医生签名", "经治医师签名", "分主刀医师签名",
-                    "病史摘要", "医生签名", "日 期"
+                    //术前讨论术前小结
+                    "讨论时间", "讨论方式", "参加人员的姓名及专业技术职务", "一、简要病情",
+                    "二、讨论结论", "1、术前诊断", "2、手术指征与禁忌症", "3、可替代方案", "4、拟施手术方式（名称）及可能的变更方案", "5、计划性多次手术",
+                    "6、拟施麻醉方式", "7、术前准备", "8、主要术中、术后风险及防范措施", "9、术中、术后注意事项（含护理事项）",
+                    "10、围手术期预防性抗菌药物使用", "11、主持人小结",
+                    "主刀医生签名", "标记医生签名", "经治医师签名", "主刀医师签名","签字时间",
+
+                    //杭州市余杭区第三人民医院术前讨论
+                    "时间", "地点", "参加人员", "姓名", "性别", "年龄", "科别", "床号", "住院号", "术前诊断", "诊断依据", "手术适应症", "拟定手术方式", "拟定麻醉方式",
+                    "术前准备", "术中、术后可能发生的意外", "防范措施", "科室讨论意见", "讨论结果", "科主任签名", "记录医师",
+
+                    //术前小结
+                    "病史摘要", "术前诊断", "术前准备", "拟施手术", "拟施麻醉", "术中注意点", "家属谈话内容", "医生签名", "日 期"
             );
+
+
             String htmlContent = YuhangsyCommonAnalysisUtil.html2String(html);
 
             if (StringUtil.isNotBlank(htmlContent)) {
@@ -44,8 +54,19 @@ public class YuhangsyPreoperativeHtmlAnalysis implements YuhangsyHtmlAnalysis {
             // 解决医生签名显示 年 月 日 时
             signatureTime(map);
             map.put("文书标题", recTitle);
-            if (StringUtil.isNotBlank(map.get("主刀医生签名"))&&map.get("主刀医生签名").contains("签字时间")) {
-                map.put("主刀医生签名",map.get("主刀医生签名").substring(0,map.get("主刀医生签名").indexOf("签字时间")));
+            if (StringUtil.isNotBlank(map.get("记录医师")) && map.get("记录医师").contains("时间：")) {
+                map.put("签字时间", map.get("记录医师").substring(map.get("记录医师").indexOf("时间：") + "时间：".length()));
+                map.put("记录医师", map.get("记录医师").substring(0, map.get("记录医师").indexOf("时间：")));
+            }
+            if (StringUtil.isNotBlank(map.get("讨论时间"))) {
+                map.put("文书时间", map.get("讨论时间"));
+            }
+            if (StringUtil.isNotBlank(map.get("时间"))) {
+                map.put("文书时间", map.get("时间"));
+                map.put("记录时间", map.get("时间"));
+            }
+            if (StringUtil.isNotBlank(map.get("日期"))) {
+                map.put("文书时间", map.get("日期"));
             }
             YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
@@ -56,26 +77,18 @@ public class YuhangsyPreoperativeHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
 
     /**
-     * 解决医生签名时间显示 年 月 日 时 分
+     * 解决签字时间显示 年 月 日 时 分
      *
      * @param map
      */
     private void signatureTime(Map<String, String> map) {
-        String goCureDoctor = map.get("经治医师签名");
-        String operateDoctor = map.get("主刀医生签名");
-        String goCureDoctor2 = map.get("分主刀医师签名");
-        String operateDoctor2 = map.get("分标记医生签名");
-        if (StringUtil.isNotBlank(goCureDoctor) && goCureDoctor.contains("年 月 日 时")) {
-            map.put("经治医师签名", goCureDoctor.replace("年 月 日 时", ""));
-        }
-        if (StringUtil.isNotBlank(operateDoctor) && operateDoctor.contains("年 月 日 时")) {
-            map.put("主刀医生签名", operateDoctor.replace("年 月 日 时", ""));
-        }
-        if (StringUtil.isNotBlank(goCureDoctor2) && goCureDoctor2.contains("年 月 日 时 分")) {
-            map.put("分主刀医师签名", goCureDoctor2.replace("年 月 日 时 分", ""));
+        String stringTime1 = map.get("签字时间");
+        String stringTime2 = map.get("时间");
+        if (StringUtil.isNotBlank(stringTime1) && stringTime1.contains("年 月 日 时 分")) {
+            map.put("签字时间", stringTime1.replace("年 月 日 时 分", ""));
         }
-        if (StringUtil.isNotBlank(operateDoctor2) && operateDoctor2.contains("年 月 日 时 分")) {
-            map.put("分标记医生签名", operateDoctor2.replace("年 月 日 时 分", ""));
+        if (StringUtil.isNotBlank(stringTime2) && stringTime2.contains("年 月 日 时 分")) {
+            map.put("时间", stringTime2.replace("年 月 日 时 分", ""));
         }
     }