台州xml数据映射修改

public/src/main/java/com/lantone/qc/pub/model/keys/StructTypeStandardKeys.java

@@ -1,292 +0,0 @@
-package com.lantone.qc.pub.model.keys;
-
-import com.google.common.collect.Lists;
-
-import java.util.List;
-
-/**
- * @Description: 各个模块标准key，各地公用
- * @author: rengb
- * @time: 2020/3/5 14:50
- */
-public class StructTypeStandardKeys {
-
-    //各大模块的标准title
-    private static final List<String> model_titles = Lists.newArrayList(
-            "会诊",
-            "手术",
-            "转科记录",
-            "入院记录",
-            "输血/血制品病程记录",
-            "危急值记录",
-            "病危通知书",
-            "死亡病例讨论记录",
-            "死亡记录",
-            "疑难病例讨论记录",
-            "医嘱信息",
-            "值班交接制度",
-            "首次病程录",
-            "病案首页",
-            "出院小结",
-            "分级护理制度",
-            "抢救记录",
-            "病重通知书",
-            "阶段小结",
-            "查房记录"
-    );
-
-
-    //会诊-会诊记录的标准key
-    public static final List<String> consultationRecord = Lists.newArrayList(
-            "会诊情况",
-            "记录时间",
-            "记录医师"
-    );
-    //会诊-会诊申请单的标准key
-    public static final List<String> consultationApplication = Lists.newArrayList();
-    //会诊-会诊结果单的标准key
-    public static final List<String> consultationResults = Lists.newArrayList();
-
-
-    //手术-术后首次病程及谈话记录的标准key
-    public static final List<String> operationDiscussion = Lists.newArrayList(
-            "记录时间",
-            "手术时间",
-            "麻醉方式",
-            "手术方式",
-            "术中诊断",
-            "手术简要经过",
-            "患者术后情况",
-            "术后处理措施",
-            "术后可能出现的并发症及预防措施",
-            "术后注意事项",
-            "谈话医师签字",
-            "患者签名",
-            "患者签名时间",
-            "被授权人/代理人签名",
-            "代理人签名时间"
-    );
-    //手术-手术记录的标准key
-    public static final List<String> operationRecord = Lists.newArrayList(
-            "手术名称",
-            "麻醉方式",
-            "术前诊断",
-            "术后诊断",
-            "手术经过"
-    );
-    //手术-术前讨论、术前小结的标准key
-    public static final List<String> preoperativeDiscussion = Lists.newArrayList(
-            "讨论时间",
-            "讨论方式",
-            "参加人员",
-            "简要病情",
-            "讨论结论",
-            "经治医师签名",
-            "经治医师签字时间",
-            "主刀医师签名",
-            "主刀医师签字时间",
-            "手术指征",
-            "麻醉方式",
-            "术前准备内容",
-            "术前术后注意事项",
-            "可能意外和防范措施",
-            "拟行术式"
-    );
-
-
-    //转科记录-转入的标准key
-    public static final List<String> transferInto = Lists.newArrayList();
-    //转科记录-转出的标准key
-    public static final List<String> transferOut = Lists.newArrayList();
-
-
-    //入院记录的标准key
-    public static final List<String> beHospitalized = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "年龄",
-            "民族",
-            "职业",
-            "出生地",
-            "婚姻",
-            "联系地址",
-            "病史陈述者",
-            "出生日期",
-            "户口地址",
-            "电话",
-            "入院日期",
-            "记录日期",
-            "主诉",
-            "现病史",
-            "既往史",
-            "个人史",
-            "婚育史",
-            "月经史",
-            "家族史",
-            "体格检查",
-            "专科体格检查",
-            "辅助检查",
-            "初步诊断",
-            "修正诊断",
-            "医师签名",
-            "补充诊断"
-    );
-
-    //输血/血制品病程记录的标准key
-    public static final List<String> clinicalBlood = Lists.newArrayList(
-            "输注原因",
-            "输注时间",
-            "输注开始",
-            "输注结束",
-            "输注种类、血型、数量",
-            "输注过程",
-            "输注后效果评价",
-            "记录医师",
-            "记录时间"
-    );
-
-    //危急值记录的标准key
-    public static final List<String> crisisValueReport = Lists.newArrayList(
-            "记录时间",
-            "记录医师",
-            "患者临床诊断",
-            "危急值记录内容",
-            "报告部门",
-            "报告人姓名",
-            "报告时间",
-            "接收人姓名",
-            "接收时间",
-            "病情分析及处理",
-            "医生签名",
-            "医生签名时间"
-    );
-
-    //病危通知书的标准key
-    public static final List<String> criticallyIllNotice = Lists.newArrayList();
-
-    //死亡病例讨论记录的标准key
-    public static final List<String> deathCaseDiscuss = Lists.newArrayList(
-            "记录时间",
-            "记录医师",
-            "入院时间",
-            "死亡时间",
-            "出院时间",
-            "入院诊断",
-            "死亡诊断",
-            "讨论时间",
-            "讨论地点",
-            "参加讨论人员",
-            "讨论主持人",
-            "讨论内容",
-            "死亡原因",
-            "结论"
-    );
-
-    //死亡记录的标准key
-    public static final List<String> deathRecord = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "科别",
-            "床号",
-            "病案号",
-            "年龄",
-            "入院时间",
-            "死亡时间",
-            "入院情况",
-            "发病经过",
-            "入院诊断",
-            "诊疗经过",
-            "死亡原因",
-            "死亡诊断",
-            "记录医师",
-            "记录时间"
-    );
-
-    //疑难病例讨论记录的标准key
-    public static final List<String> difficultCaseDiscuss = Lists.newArrayList(
-            "记录时间",
-            "记录医师",
-            "入院时间",
-            "入院诊断",
-            "讨论时间",
-            "讨论地点",
-            "讨论目的",
-            "主持人",
-            "参加讨论者",
-            "讨论内容",
-            "结论"
-    );
-
-    //医嘱信息的标准key
-    public static final List<String> doctorAdvice = Lists.newArrayList();
-
-    //值班交接制度的标准key
-    public static final List<String> dutyShiftSystem = Lists.newArrayList(
-            "记录时间",
-            "记录医师"
-    );
-
-    //首次病程录的标准key
-    public static final List<String> firstCourseRecord = Lists.newArrayList(
-            "病例特点",
-            "初步诊断",
-            "诊断依据",
-            "鉴别诊断",
-            "诊疗计划",
-            "记录医师",
-            "记录时间"
-    );
-
-    //病案首页
-    public static final List<String> FirstPageRecord = Lists.newArrayList();
-
-    //出院小结的标准key
-    public static final List<String> leaveHospital = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "年龄",
-            "床号",
-            "入院时间",
-            "出院时间",
-            "入院诊断",
-            "出院诊断",
-            "住院天数",
-            "入院情况",
-            "诊治经过",
-            "出院情况",
-            "出院医嘱",
-            "健康教育",
-            "随访计划",
-            "温馨提示",
-            "医师签名",
-            "签名时间"
-    );
-
-    //分级护理制度的标准key
-    public static final List<String> nursingSystem = Lists.newArrayList();
-
-    //抢救记录的标准key
-    public static final List<String> rescue = Lists.newArrayList(
-            "抢救时间",
-            "记录时间",
-            "记录医师",
-            "抢救过程",
-            "参与人员"
-    );
-
-    //病重通知书的标准key
-    public static final List<String> seriouslyIllNotice = Lists.newArrayList();
-
-    //阶段小结的标准key
-    public static final List<String> stagesSummary = Lists.newArrayList();
-
-    //查房记录的标准key
-    public static final List<String> threeLevelWard = Lists.newArrayList(
-            "查房标题",
-            "病情记录",
-            "查房日期",
-            "记录时间",
-            "记录医师"
-    );
-
-}

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouClinicBloodEffectDocTrans.java

@@ -17,6 +17,7 @@ import java.util.Map;
  * @Date: 2020-04-19 17:53
  */
 public class TaiZhouClinicBloodEffectDocTrans extends ModelDocTrans {
+
     @Override
     public List<ClinicBloodEffectDoc> extract(MedrecVo medrecVo) {
         List<ClinicBloodEffectDoc> retList = Lists.newArrayList();
@@ -29,13 +30,15 @@ public class TaiZhouClinicBloodEffectDocTrans extends ModelDocTrans {
 
     private ClinicBloodEffectDoc getClinicBloodEffectDoc(String content) {
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         ClinicBloodEffectDoc clinicBloodEffectDoc = new ClinicBloodEffectDoc();
         clinicBloodEffectDoc.setStructureMap(structureMap);
-        clinicBloodEffectDoc.setPageData((Map)sourceMap);
+        clinicBloodEffectDoc.setPageData((Map) structureMap);
+
         return clinicBloodEffectDoc;
     }
 
     private List<String> keyContrasts = Lists.newArrayList();
+
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouClinicalBloodDocTrans.java

@@ -33,14 +33,14 @@ public class TaiZhouClinicalBloodDocTrans extends ModelDocTrans {
 
         ClinicalBloodDoc clinicalBloodDoc = new ClinicalBloodDoc();
         clinicalBloodDoc.setStructureMap(structureMap);
-        clinicalBloodDoc.setPageData((Map) sourceMap);
+        clinicalBloodDoc.setPageData((Map) structureMap);
         return clinicalBloodDoc;
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
+            "开始时间=输注开始",
             "医生=记录医师",
             "结束时间=输注结束",
-            "开始时间=输注开始",
             "内容=输注后效果评价"
     );
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouConsultationDocTrans.java

@@ -85,20 +85,20 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationRecordDoc getConsultationRecordDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts);
 
         ConsultationRecordDoc consultationRecordDoc = new ConsultationRecordDoc();
         consultationRecordDoc.setStructureMap(structureMap);
-        consultationRecordDoc.setPageData((Map)sourceMap);
+        consultationRecordDoc.setPageData((Map) structureMap);
         return consultationRecordDoc;
     }
 
     // 会诊记录映射字段
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
-            "会诊执行情况=会诊情况",
             "事件日期=记录时间",
-            "医生=记录医师"
+            "医生=记录医师",
+            "会诊执行情况=会诊情况"
     );
 
 
@@ -124,24 +124,23 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationResultsDoc getConsultationResultsDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_keyContrasts);
 
         ConsultationResultsDoc consultationResultsDoc = new ConsultationResultsDoc();
         consultationResultsDoc.setStructureMap(structureMap);
-        consultationResultsDoc.setPageData((Map)sourceMap);
+        consultationResultsDoc.setPageData((Map) structureMap);
         return consultationResultsDoc;
     }
 
     // 会诊结果映射字段
     private List<String> consultationResults_keyContrasts = Lists.newArrayList(
-        "事件日期1(会诊申请日期)=会诊申请日期",
-//        "病史描述=会诊到达时间",
-        "病史描述=病史回顾描述",
-        "会诊诊断=当前诊断",
-        "记录及建议=会诊意见",
-        "医生=医师签名",
-        "病历日期=会诊日期及时间"
+            "会诊诊断=当前诊断",
+            "事件日期1(会诊申请日期)=会诊申请日期",
+            "医生=医师签名",
+            "病史描述=病史回顾描述",
+            "病历日期=会诊日期及时间",
+            "记录及建议=会诊意见"
     );
 
 
@@ -167,30 +166,27 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts);
 
         ConsultationApplicationDoc consultationApplicationDoc = new ConsultationApplicationDoc();
         consultationApplicationDoc.setStructureMap(structureMap);
-        consultationApplicationDoc.setPageData((Map)sourceMap);
+        consultationApplicationDoc.setPageData((Map) structureMap);
 
         return consultationApplicationDoc;
     }
 
     // 会诊申请单映射字段
     private List<String> consultationApplication_keyContrasts = Lists.newArrayList(
-            "本人姓名=姓名",
-            "性别=性别",
-            "病区=病区",
-            "床号=床号",
-            "病历号=病案号",
+            "事件日期=会诊时间",
+            "会诊类别=会诊分类",
             "简要病情=简要病情及诊疗",
             "会诊理由和目的=申请理由目的",
+            "本人姓名=姓名",
+            "病历号=病案号",
             "会诊科室=受邀科室",
-            "会诊类别=会诊分类",
-            "事件日期=会诊时间",
-            "临床科室=会诊地点",
-            "申请医生=签名"
+            "申请医生=签名",
+            "临床科室=会诊地点"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouCrisisValueReportDocTrans.java

@@ -33,21 +33,11 @@ public class TaiZhouCrisisValueReportDocTrans extends ModelDocTrans {
 
         CrisisValueReportDoc crisisValueReportDoc = new CrisisValueReportDoc();
         crisisValueReportDoc.setStructureMap(structureMap);
-        crisisValueReportDoc.setPageData((Map)sourceMap);
+        crisisValueReportDoc.setPageData((Map) structureMap);
 
         return crisisValueReportDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList(
-            "姓名=",
-            "病历号=",
-            "病历日期=",
-            "床号=",
-            "临床科室=",
-            "病人基本信息=",
-            "医生=",
-            "内容=",
-            "性别="
-    );
+    private List<String> keyContrasts = Lists.newArrayList();
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouCriticallyIllNoticeDocTrans.java

@@ -33,36 +33,11 @@ public class TaiZhouCriticallyIllNoticeDocTrans extends ModelDocTrans {
 
         CriticallyIllNoticeDoc criticallyIllNoticeDoc = new CriticallyIllNoticeDoc();
         criticallyIllNoticeDoc.setStructureMap(structureMap);
-        criticallyIllNoticeDoc.setPageData((Map)sourceMap);
+        criticallyIllNoticeDoc.setPageData((Map) structureMap);
 
         return criticallyIllNoticeDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList(
-            "关系=",
-            "家属信息=",
-            "患者签字=",
-            "当前诊断=",
-            "床号=",
-            "审核人=",
-            "病人基本信息=",
-            "审核日期=",
-            "事件日期=",
-            "家属意见=",
-            "医生=",
-            "性别=",
-            "本人姓名=",
-            "病历号=",
-            "病历日期=",
-            "入院日期=",
-            "临床科室=",
-            "简要病情=",
-            "年龄单位=",
-            "事件基本信息=",
-            "审核=",
-            "病历状态=",
-            "年龄=",
-            "内容="
-    );
+    private List<String> keyContrasts = Lists.newArrayList();
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDeathCaseDiscussDocTrans.java

@@ -21,55 +21,21 @@ public class TaiZhouDeathCaseDiscussDocTrans extends ModelDocTrans {
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = new DeathCaseDiscussDoc();
         deathCaseDiscussDoc.setStructureMap(structureMap);
-        deathCaseDiscussDoc.setPageData((Map)sourceMap);
+        deathCaseDiscussDoc.setPageData((Map) structureMap);
+
         return deathCaseDiscussDoc;
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "审核人=",
-            "讨论地点=",
-            "事件日期=",
-            "医生=",
-            "专科检查=",
-            "参加人员及职称=",
-            "参加人员及职称（医生）=",
-            "简要病情=",
-            "事件基本信息=",
-            "职务=",
-            "血压=",
-            "影像学检查=",
-            "年龄=",
-            "讨论小结=",
-            "主诉=",
             "主持人=讨论主持人",
-            "当前诊断=",
-            "床号=",
-            "实验室检查=",
-            "病人基本信息=",
-            "死亡原因=",
-            "审核日期=",
-            "记录人=",
             "死亡日期=死亡时间",
-            "性别=",
-            "辅助检查结果=",
             "讨论意见=讨论内容",
-            "本人姓名=",
-            "病历号=",
-            "病历日期=",
-            "职称=",
-            "现病史-发病情况=入院情况",
-            "脉搏=",
-            "呼吸=",
-            "入院日期=",
-            "临床科室=",
-            "审核=",
-            "病历状态=",
-            "医生=记录医师",
-            "体温(耳)="
+            "现病史- 发病情况=入院情况",
+            "医生=记录医师"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDeathRecordDocTrans.java

@@ -21,50 +21,20 @@ public class TaiZhouDeathRecordDocTrans extends ModelDocTrans {
     public DeathRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         DeathRecordDoc deathRecordDoc = new DeathRecordDoc();
         deathRecordDoc.setStructureMap(structureMap);
-        deathRecordDoc.setPageData((Map)sourceMap);
+        deathRecordDoc.setPageData((Map) structureMap);
+
         return deathRecordDoc;
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "入院诊断=",
-            "审核人=",
-            "事件日期=",
-            "医生=",
-            "专科检查=",
-            "事件基本信息=",
-            "血压=",
-            "年龄=",
-            "影像学检查=",
-            "主诉=",
             "当前诊断=死亡诊断",
-            "床号=",
-            "病人基本信息=",
-            "实验室检查=",
-            "就诊次数=",
-            "死亡原因=",
-            "审核日期=",
-            "入院情况=",
             "死亡日期=死亡时间",
-            "辅助检查结果=",
-            "性别=",
-            "本人姓名=",
-            "病历号=",
             "初步诊断=入院诊断",
-            "病历日期=",
-            "现病史-发病情况=",
-            "呼吸=",
-            "入院日期=",
-            "脉搏=",
-            "临床科室=",
-            "诊治经过=诊疗经过",
-            "病历状态=",
-            "审核=",
-            "体温(耳)=",
-            "入院病情="
+            "诊治经过=诊疗经过"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDifficultCaseDiscussDocTrans.java

@@ -28,12 +28,13 @@ public class TaiZhouDifficultCaseDiscussDocTrans extends ModelDocTrans {
     }
 
     private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = new DifficultCaseDiscussDoc();
         difficultCaseDiscussDoc.setStructureMap(structureMap);
-        difficultCaseDiscussDoc.setPageData((Map)sourceMap);
+        difficultCaseDiscussDoc.setPageData((Map) structureMap);
+
         return difficultCaseDiscussDoc;
     }
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouLeaveHospitalDocTrans.java

@@ -21,33 +21,25 @@ public class TaiZhouLeaveHospitalDocTrans extends ModelDocTrans {
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
         leaveHospitalDoc.setStructureMap(structureMap);
-        leaveHospitalDoc.setPageData((Map)sourceMap);
+        leaveHospitalDoc.setPageData((Map) structureMap);
+
         return leaveHospitalDoc;
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
             "本人姓名=姓名",
-            "性别=性别",
-            "年龄=年龄",
-            "床号=床号",
             "入院日期=入院时间",
-            "出院时间=出院时间",
-            "入院诊断=入院诊断",
-            "出院诊断=出院诊断",
             "实际住院天数=住院天数",
-            "入院情况=入院情况",
-            "诊治经过=诊治经过",
             "出院时情况=出院情况",
-            "出院医嘱=出院医嘱",
-//            "注意事项=健康教育",
+            //            "注意事项=健康教育",
             "复诊时间=随访计划",
             "出院指导=健康教育",
             "医生=医师签名",
             "病历日期=签名时间"
-            );
+    );
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -28,7 +28,7 @@ import java.util.Set;
 public class TaiZhouOperationDocTrans extends ModelDocTrans {
 
     /**
-     * 手术文档包含：术后首次病程及谈话记录；手术记录；术前讨论、术前小结
+     * 手术文档包含：术后首次病程及谈话记录；手术记录；术前讨论、术前小结；手术知情同意书；手术安全核查表
      *
      * @param medrecVo
      * @return
@@ -91,12 +91,12 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationDiscussionDoc getOperationDiscussionDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
 
         OperationDiscussionDoc operationDiscussionDoc = new OperationDiscussionDoc();
         operationDiscussionDoc.setStructureMap(structureMap);
-        operationDiscussionDoc.setPageData((Map)sourceMap);
+        operationDiscussionDoc.setPageData((Map) structureMap);
 
         return operationDiscussionDoc;
     }
@@ -126,26 +126,20 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationRecordDoc getOperationRecordDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
 
         OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
         operationRecordDoc.setStructureMap(structureMap);
-        operationRecordDoc.setPageData((Map)sourceMap);
-//        MapUtil.console(structureMap, "手术记录");
+        operationRecordDoc.setPageData((Map) structureMap);
         return operationRecordDoc;
     }
 
     // 手术记录
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
-            "手术名称=手术名称",
-            "麻醉方式=麻醉方式",
-            "术前诊断=术前诊断",
-            "术后诊断=术后诊断",
-            "手术经过=手术经过",
             "结束时间=手术结束时间",
             "开始时间=手术开始时间"
-            );
+    );
 
 
     /**********************************************术前讨论、术前小结****************************************************/
@@ -170,25 +164,18 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = new PreoperativeDiscussionDoc();
         preoperativeDiscussionDoc.setStructureMap(structureMap);
-        preoperativeDiscussionDoc.setPageData((Map)sourceMap);
-//        MapUtil.console(structureMap, "术前讨论、术前小结");
+        preoperativeDiscussionDoc.setPageData((Map) structureMap);
         return preoperativeDiscussionDoc;
     }
 
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
-            "讨论时间=讨论时间",
-            "讨论方式=讨论方式",
             "参加人员及职称=参加人员",
-            "简要病情=简要病情",
             "主刀医师=主刀医师签名",
-            "主刀医师签字时间=主刀医师签字时间",
-            "手术指征=手术指征",
-            "麻醉方式=麻醉方式",
             "术前准备=术前准备内容",
             "注意事项=术前术后注意事项",
             "术中、术后防范措施=可能意外和防范措施",
@@ -217,13 +204,12 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationInformedConsentDoc getOperationInformedConsentDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationInformedConsent_keyContrasts);
 
         OperationInformedConsentDoc operationInformedConsentDoc = new OperationInformedConsentDoc();
         operationInformedConsentDoc.setStructureMap(structureMap);
-        operationInformedConsentDoc.setPageData((Map) sourceMap);
-//        MapUtil.console(structureMap, "手术知情同意书");
+        operationInformedConsentDoc.setPageData((Map) structureMap);
         return operationInformedConsentDoc;
     }
 
@@ -272,7 +258,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
 
         OperationSafetyChecklistDoc operationSafetyChecklistDoc = new OperationSafetyChecklistDoc();
         operationSafetyChecklistDoc.setStructureMap(structureMap);
-        operationSafetyChecklistDoc.setPageData((Map) sourceMap);
+        operationSafetyChecklistDoc.setPageData((Map) structureMap);
 
         return operationSafetyChecklistDoc;
     }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouPathologyShipDocTrans.java

@@ -29,13 +29,14 @@ public class TaiZhouPathologyShipDocTrans extends ModelDocTrans {
 
     private PathologyShipDoc getPathologyShipDoc(String content) {
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         PathologyShipDoc pathologyShipDoc = new PathologyShipDoc();
         pathologyShipDoc.setStructureMap(structureMap);
-        pathologyShipDoc.setPageData((Map)sourceMap);
+        pathologyShipDoc.setPageData((Map) structureMap);
         return pathologyShipDoc;
     }
 
     private List<String> keyContrasts = Lists.newArrayList("检验标本=送检标本名称");
+
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouRescueDocTrans.java

@@ -28,12 +28,13 @@ public class TaiZhouRescueDocTrans extends ModelDocTrans {
     }
 
     private RescueDoc getRescueDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         RescueDoc rescueDoc = new RescueDoc();
         rescueDoc.setStructureMap(structureMap);
-        rescueDoc.setPageData((Map)sourceMap);
+        rescueDoc.setPageData((Map) structureMap);
+
         return rescueDoc;
     }
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouSeriouslyIllNoticeDocTrans.java

@@ -28,40 +28,16 @@ public class TaiZhouSeriouslyIllNoticeDocTrans extends ModelDocTrans {
     }
 
     private SeriouslyIllNoticeDoc getSeriouslyIllNoticeDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         SeriouslyIllNoticeDoc seriouslyIllNoticeDoc = new SeriouslyIllNoticeDoc();
         seriouslyIllNoticeDoc.setStructureMap(structureMap);
-        seriouslyIllNoticeDoc.setPageData((Map)sourceMap);
+        seriouslyIllNoticeDoc.setPageData((Map) structureMap);
+
         return seriouslyIllNoticeDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList(
-            "关系=",
-            "家属信息=",
-            "患者签字=",
-            "当前诊断=",
-            "床号=",
-            "审核人=",
-            "病人基本信息=",
-            "审核日期=",
-            "事件日期=",
-            "家属意见=",
-            "医生=",
-            "性别=",
-            "本人姓名=",
-            "病历号=",
-            "病历日期=",
-            "入院日期=",
-            "临床科室=",
-            "简要病情=",
-            "年龄单位=",
-            "事件基本信息=",
-            "审核=",
-            "病历状态=",
-            "年龄=",
-            "内容="
-    );
+    private List<String> keyContrasts = Lists.newArrayList();
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouStagesSummaryDocTrans.java

@@ -28,57 +28,16 @@ public class TaiZhouStagesSummaryDocTrans extends ModelDocTrans {
     }
 
     private StagesSummaryDoc getStagesSummaryDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         StagesSummaryDoc stagesSummaryDoc = new StagesSummaryDoc();
         stagesSummaryDoc.setStructureMap(structureMap);
-        stagesSummaryDoc.setPageData((Map)sourceMap);
+        stagesSummaryDoc.setPageData((Map) structureMap);
+        
         return stagesSummaryDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList(
-            "入院诊断=",
-            "审核人=",
-            "事件日期=",
-            "医生=",
-            "专科检查=",
-            "简要病情=",
-            "事件基本信息=",
-            "血压=",
-            "年龄=",
-            "影像学检查=",
-            "内容=",
-            "科主任=",
-            "治疗计划和措施=",
-            "主诉=",
-            "床号=",
-            "主任医生=",
-            "当前诊断=",
-            "病人基本信息=",
-            "实验室检查=",
-            "医疗组长=",
-            "就诊次数=",
-            "审核日期=",
-            "患者一般情况=",
-            "入院情况=",
-            "性别=",
-            "辅助检查结果=",
-            "本人姓名=",
-            "病历号=",
-            "初步诊断=",
-            "病历日期=",
-            "现病史-发病情况=",
-            "呼吸=",
-            "脉搏=",
-            "入院日期=",
-            "临床科室=",
-            "年龄单位=",
-            "诊治经过=",
-            "病历状态=",
-            "审核=",
-            "体温(耳)=",
-            "目前情况="
-    );
+    private List<String> keyContrasts = Lists.newArrayList();
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouThreeLevelWardDocTrans.java

@@ -10,7 +10,6 @@ import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -37,7 +36,7 @@ public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
     }
 
     private void classifyThreeLevelWardDoc(ThreeLevelWardDoc result, String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         if (StringUtils.isEmpty(structureMap.get("查房日期"))) {
@@ -56,16 +55,16 @@ public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
         //总的查房记录 汇总
         ThreeLevelWardDoc allDoctorWradDoc = new ThreeLevelWardDoc();
         allDoctorWradDoc.setStructureMap(structureMap);
-        allDoctorWradDoc.setPageData((Map)sourceMap);
+        allDoctorWradDoc.setPageData((Map) structureMap);
         result.addAllDoctorWradDoc(allDoctorWradDoc);
 
         //主任医师查房
-        DirectorDoctorWardDoc directorDoctorWardDoc = findDirectorDoctorWardDoc(sourceMap, structureMap);
+        DirectorDoctorWardDoc directorDoctorWardDoc = findDirectorDoctorWardDoc(structureMap);
         if (directorDoctorWardDoc != null) {
-            result.addDirectorDoctorWardDoc(findDirectorDoctorWardDoc(sourceMap, structureMap));
+            result.addDirectorDoctorWardDoc(findDirectorDoctorWardDoc(structureMap));
         }
         //主治医师查房
-        AttendingDoctorWardDoc attendingDoctorWardDoc = findAttendingDoctorWardDoc(sourceMap, structureMap);
+        AttendingDoctorWardDoc attendingDoctorWardDoc = findAttendingDoctorWardDoc(structureMap);
         if (attendingDoctorWardDoc != null) {
             result.addAttendingDoctorWardDoc(attendingDoctorWardDoc);
         }
@@ -73,58 +72,46 @@ public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
         if (directorDoctorWardDoc == null && attendingDoctorWardDoc == null) {
             GeneralDoctorWardDoc generalDoctorWardDoc = new GeneralDoctorWardDoc();
             generalDoctorWardDoc.setStructureMap(structureMap);
-            generalDoctorWardDoc.setPageData((Map)sourceMap);
+            generalDoctorWardDoc.setPageData((Map) structureMap);
             result.addGeneralDoctorWardDoc(generalDoctorWardDoc);
         }
     }
 
     /**
      * 主任医师查房
-     * @param sourceMap
+     *
      * @param structureMap
      */
-    private DirectorDoctorWardDoc findDirectorDoctorWardDoc(Map<String, String> sourceMap, Map<String, String> structureMap) {
+    private DirectorDoctorWardDoc findDirectorDoctorWardDoc(Map<String, String> structureMap) {
         String title = structureMap.get("查房标题");
         title = subTitle(title);    //标题有代字
 
         DirectorDoctorWardDoc directorDoctorWardDoc = null;
-        if (StringUtils.isNotEmpty(title) && title.contains("主任") ) {
+        if (StringUtils.isNotEmpty(title) && title.contains("主任")) {
             directorDoctorWardDoc = new DirectorDoctorWardDoc();
             directorDoctorWardDoc.setStructureMap(structureMap);
-            directorDoctorWardDoc.setPageData((Map)sourceMap);
+            directorDoctorWardDoc.setPageData((Map) structureMap);
         }
         return directorDoctorWardDoc;
     }
 
     /**
      * 主治医师查房
-     * @param sourceMap
+     *
      * @param structureMap
      */
-    private AttendingDoctorWardDoc findAttendingDoctorWardDoc(Map<String, String> sourceMap, Map<String, String> structureMap) {
+    private AttendingDoctorWardDoc findAttendingDoctorWardDoc(Map<String, String> structureMap) {
         String title = structureMap.get("查房标题");
         title = subTitle(title);    //标题有代字
         AttendingDoctorWardDoc attendingDoctorWardDoc = null;
         if (StringUtils.isNotEmpty(title) && title.contains("主治")) {
             attendingDoctorWardDoc = new AttendingDoctorWardDoc();
             attendingDoctorWardDoc.setStructureMap(structureMap);
-            attendingDoctorWardDoc.setPageData((Map)sourceMap);
+            attendingDoctorWardDoc.setPageData((Map) structureMap);
         }
         return attendingDoctorWardDoc;
     }
 
-    /**
-     * 普通医师查房
-     * @param threeLevelWardDoc
-     */
-    private GeneralDoctorWardDoc findGeneralDoctorWardDoc(ThreeLevelWardDoc threeLevelWardDoc) {
-        GeneralDoctorWardDoc generalDoctorWardDoc = new GeneralDoctorWardDoc();
-        generalDoctorWardDoc.setStructureMap(threeLevelWardDoc.getStructureMap());
-        generalDoctorWardDoc.setText(threeLevelWardDoc.getText());
-        generalDoctorWardDoc.setPageData(threeLevelWardDoc.getPageData());
-        return generalDoctorWardDoc;
-    }
-
     private List<String> keyContrasts = Lists.newArrayList(
             "事件日期=记录时间",
             "事件日期=查房日期",

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouTransferRecordDocTrans.java

@@ -78,6 +78,7 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
 
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setStructureMap(structureMap);
+        transferIntoDoc.setPageData((Map) structureMap);
 
         return transferIntoDoc;
     }
@@ -111,6 +112,7 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setStructureMap(structureMap);
+        transferOutDoc.setPageData((Map) structureMap);
 
         return transferOutDoc;
     }