厦门质控调试

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenBeHospitalizedDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunBeHospitalizedHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -32,24 +30,7 @@ public class XiamenBeHospitalizedDocTrans extends ModelDocTrans {
             Map<String, String> structureMap = null;
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-            } else {
-                String recTitle = contentMap.get("recTitle").toString();
-                String recTypeId = contentMap.get("recTypeId").toString();
-                BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunBeHospitalizedHtmlAnalysis();
-                Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-                if (MapUtils.isNotEmpty(sourceMap)) {
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                    structureMap.put("记录编号", contentMap.get("recId").toString());
-                    structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-                    //初步诊断特殊处理
-                    if (structureMap.containsKey("初步诊断")) {
-                        String initDiag = structureMap.get("初步诊断");
-                        if (initDiag.contains("<img")) {
-                            initDiag = initDiag.split("<img")[0];
-                            structureMap.put("初步诊断", initDiag);
-                        }
-                    }
-                }
+                structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "1");
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenClinicBloodEffectDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.ClinicBloodEffectDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunClinicBloodEffectHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +43,7 @@ public class XiamenClinicBloodEffectDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunClinicBloodEffectHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "32");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             ClinicBloodEffectDoc clinicBloodEffectDoc = ModelDocGenerate.clinicBloodEffectDoc(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenClinicalBloodDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunClinicalBloodHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +43,7 @@ public class XiamenClinicalBloodDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunClinicalBloodHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "10");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             ClinicalBloodDoc clinicalBloodDoc = ModelDocGenerate.clinicalBloodDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenConsultationDocTrans.java

@@ -12,9 +12,6 @@ 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.beilun.util.BeiLunConsultationHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunConsultationRecordHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -95,16 +92,7 @@ public class XiamenConsultationDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunConsultationRecordHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, consultationRecord_keyContrasts, "7");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             ConsultationRecordDoc consultationRecordDoc = ModelDocGenerate.consultationRecordDocGen(structureMap);
@@ -156,16 +144,7 @@ public class XiamenConsultationDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunConsultationHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_pageDataTitles);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, consultationResults_pageDataTitles, "31");
         }
         if (StringUtil.isNotBlank(structureMap.get("会诊科室"))) {
             structureMap.put("会诊科室", structureMap.get("会诊科室").replaceAll("XXXX", "").trim());
@@ -223,14 +202,7 @@ public class XiamenConsultationDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunConsultationHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts);
-            structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, consultationApplication_keyContrasts, "31");
         }
 
         ConsultationApplicationDoc consultationApplicationDoc = ModelDocGenerate.consultationApplicationDocGen(structureMap);
@@ -240,21 +212,6 @@ public class XiamenConsultationDocTrans extends ModelDocTrans {
         return consultationApplicationDoc;
     }
 
-    private List<String> consultationApplication_sourceTitles = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "病区",
-            "床号",
-            "病案号",
-            "简要病情及诊疗",
-            "申请理由目的",
-            "受邀科室",
-            "会诊分类",
-            "会诊时间",
-            "会诊地点",
-            "签名"
-    );
-
     private List<String> consultationApplication_keyContrasts = Lists.newArrayList(
             "++++姓名=姓名",
             "申请时间=申请日期",

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenCrisisValueReportDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.CrisisValueReportDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunCrisisValueReportHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +43,7 @@ public class XiamenCrisisValueReportDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunCrisisValueReportHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "23");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             CrisisValueReportDoc crisisValueReportDoc = ModelDocGenerate.crisisValueReportDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenCriticallyIllNoticeDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.CriticallyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunCriticallyIllNoticeHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
@@ -46,16 +44,7 @@ public class XiamenCriticallyIllNoticeDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunCriticallyIllNoticeHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "25");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             CriticallyIllNoticeDoc criticallyIllNoticeDoc = ModelDocGenerate.criticallyIllNoticeDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDeathCaseDiscussDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunDeathCaseDiscussHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -32,16 +30,7 @@ public class XiamenDeathCaseDiscussDocTrans extends ModelDocTrans {
             Map<String, String> structureMap = null;
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-            } else {
-                String recTitle = contentMap.get("recTitle").toString();
-                String recTypeId = contentMap.get("recTypeId").toString();
-                BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunDeathCaseDiscussHtmlAnalysis();
-                Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-                if (MapUtils.isNotEmpty(sourceMap)) {
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                    structureMap.put("记录编号", contentMap.get("recId").toString());
-                    structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-                }
+                structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "3");
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 deathCaseDiscussDoc = ModelDocGenerate.deathCaseDiscussDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDeathRecordDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunDeathRecordHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
@@ -33,16 +31,7 @@ public class XiamenDeathRecordDocTrans extends ModelDocTrans {
             Map<String, String> structureMap = null;
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-            } else {
-                String recTitle = contentMap.get("recTitle").toString();
-                String recTypeId = contentMap.get("recTypeId").toString();
-                BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunDeathRecordHtmlAnalysis();
-                Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-                if (MapUtils.isNotEmpty(sourceMap)) {
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                    structureMap.put("记录编号", contentMap.get("recId").toString());
-                    structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-                }
+                structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "24");
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 deathRecordDoc = ModelDocGenerate.deathRecordDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDifficultCaseDiscussDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.DifficultCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunDifficultCaseDiscussHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,32 +43,7 @@ public class XiamenDifficultCaseDiscussDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunDifficultCaseDiscussHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (!sourceMap.containsKey("具体讨论意见") && sourceMap.containsKey("参加人员")) {
-                String participant = sourceMap.get("参加人员");
-                if (participant.contains("医师汇报病史")) {
-                    String parCrew = "";
-                    //参加人员
-                    if (participant.indexOf("医师汇报病史") > 2) {
-                        parCrew = participant.substring(0, participant.indexOf("医师汇报病史") - 2);
-                    }
-                    //具体讨论意见
-                    String SpeDiscussion = participant.substring(Math.max(0, participant.indexOf("医师汇报病史") - 2));
-                    sourceMap.put("参加人员", parCrew);
-                    sourceMap.put("具体讨论意见", SpeDiscussion);
-                }
-            }
-
-
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "19");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             DifficultCaseDiscussDoc difficultCaseDiscussDoc = ModelDocGenerate.difficultCaseDiscussDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenDutyShiftSystemDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.DutyShiftSystemDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunDutyShiftSystemHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +43,7 @@ public class XiamenDutyShiftSystemDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunDutyShiftSystemHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "9");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             DutyShiftSystemDoc dutyShiftSystemDoc = ModelDocGenerate.dutyShiftSystemDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenFirstCourseRecordDocTrans.java

@@ -1,14 +1,10 @@
 package com.lantone.qc.trans.xiamen;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
-import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunFirstCourseRecordHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
@@ -37,28 +33,16 @@ public class XiamenFirstCourseRecordDocTrans extends ModelDocTrans {
             Map<String, String> structureMap = null;
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-            } else {
-                String recTitle = contentMap.get("recTitle").toString();
-                String recTypeId = contentMap.get("recTypeId").toString();
-                BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunFirstCourseRecordHtmlAnalysis();
-                Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-                if (MapUtils.isNotEmpty(sourceMap)) {
-                    sourceMap = removeSerialNumber(sourceMap);
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                    structureMap.put("记录编号", contentMap.get("recId").toString());
-                    structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-                }
-            }
-            if (StringUtil.isNotBlank(structureMap.get("医生签名"))) {
-                structureMap.put("医生签名", structureMap.get("医生签名").replaceAll("医生签名", ""));
+                structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "2");
+                List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
+                String treatPlanJoin = structureMapJoin(structureMap, keys);
+                firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
                 firstCourseRecordDoc.setText(CommonAnalysisUtil.html2String(content));
                 firstCourseRecordDoc.setPageData((Map) structureMap);
-                List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
-                String treatPlanJoin = structureMapJoin(structureMap, keys);
-                firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
+
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -66,12 +50,6 @@ public class XiamenFirstCourseRecordDocTrans extends ModelDocTrans {
         return firstCourseRecordDoc;
     }
 
-    private Map<String, String> removeSerialNumber(Map<String, String> sourceMap) {
-        Map<String, String> structureMap = Maps.newLinkedHashMap();
-        sourceMap.forEach((key, value) -> structureMap.put(key.replaceAll("[一二三四五六()（）.123456]", ""), value));
-        return structureMap;
-    }
-
     private List<String> keyContrasts = Lists.newArrayList(
             "时间=病历日期",
             "病历特点=病例特点",

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenLeaveHospitalDocTrans.java

@@ -6,8 +6,6 @@ import com.lantone.qc.pub.model.label.LeaveHospitalDoctorAdviceLabel;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunLeaveHospitalHtmlAnalysis;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
@@ -35,16 +33,7 @@ public class XiamenLeaveHospitalDocTrans extends ModelDocTrans {
             Map<String, String> structureMap = null;
             if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
                 structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-            } else {
-                String recTitle = contentMap.get("recTitle").toString();
-                String recTypeId = contentMap.get("recTypeId").toString();
-                BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunLeaveHospitalHtmlAnalysis();
-                Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-                if (MapUtils.isNotEmpty(sourceMap)) {
-                    structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                    structureMap.put("记录编号", contentMap.get("recId").toString());
-                    structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-                }
+                structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "5");
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenOperationDocTrans.java

@@ -14,16 +14,10 @@ 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.beilun.util.BeiLunHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysisUtil;
-import com.lantone.qc.trans.beilun.util.BeiLunOperationHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunOperationRecordHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunPreoperativeHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
-import org.jsoup.Jsoup;
 
 import java.util.List;
 import java.util.Map;
@@ -102,37 +96,18 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
     private OperationDiscussionDoc getOperationDiscussionDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
         Map<String, String> structureMap = null;
-        OperationDiscussionDoc operationDiscussionDoc = new OperationDiscussionDoc();
+        OperationDiscussionDoc operationDiscussionDoc = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
             if (MapUtils.isNotEmpty(structureMap)) {
+                structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, operationDiscussion_keyContrasts, "18");
                 operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
                 operationDiscussionDoc.setText(content);
                 operationDiscussionDoc.setPageData((Map) structureMap);
-                return operationDiscussionDoc;
-            } else {
-                return null;
-            }
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunOperationHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
-            if (MapUtils.isNotEmpty(structureMap)) {
-                operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
-                String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
-                operationDiscussionDoc.setText(text);
-                operationDiscussionDoc.setPageData((Map) structureMap);
-                return operationDiscussionDoc;
-            } else {
-                return null;
+
             }
         }
+        return operationDiscussionDoc;
     }
 
     private List<String> operationDiscussion_keyContrasts = Lists.newArrayList(
@@ -178,20 +153,9 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunOperationRecordHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            //含有手术情况知情书时间特殊处理
-            if (sourceMap.containsKey("时间") && sourceMap.get("时间").contains("宁波市北仑区人民医院")) {
-                sourceMap.put("时间", sourceMap.get("时间").substring(0, sourceMap.get("时间").indexOf("宁波市北仑区人民医院")));
-            }
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, operationRecord_keyContrasts, "17");
+        }
+        if (MapUtils.isNotEmpty(structureMap)) {
             List<String> titles = Lists.newArrayList("手术开始时间", "手术结束时间");
             for (String title : titles) {
                 eliminateDate(structureMap, title);
@@ -202,8 +166,6 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
             if (structureMap.containsKey("接生者")) {
                 structureMap.put("接生者", structureMap.get("接生者").replace("\n", "").replaceAll("接生者签名", ""));
             }
-        }
-        if (MapUtils.isNotEmpty(structureMap)) {
             OperationRecordDoc operationRecordDoc = ModelDocGenerate.operationRecordDocGen(structureMap);
             operationRecordDoc.setPageData((Map) structureMap);
             return operationRecordDoc;
@@ -255,16 +217,7 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunPreoperativeHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, preoperativeDiscussion_keyContrasts, "11");
         }
         List<String> titles = Lists.newArrayList("讨论时间", "手术指征", "注意事项", "术前诊断", "医生签名", "风险及防范措施", "可替代方案", "术前准备", "参加人员");
         if (structureMap.containsKey("简要病情")) {
@@ -352,20 +305,20 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
 
     private OperationInformedConsentDoc getOperationInformedConsentDoc(Map<String, Object> contentMap) {
         String modeId = "16";
-//        String content = contentMap.get("xmlText").toString();
-//        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-//        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-//        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-//        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationInformedConsent_keyContrasts, modeId);
-//
-//        String text = CxXmlUtil.getXmlText(content);
-//        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationInformedConsent_sourceTitles, text);
-//        cutWordMap.putAll(structureMap);
-//
-//        OperationInformedConsentDoc operationInformedConsentDoc = ModelDocGenerate.operationInformedConsentDocGen(cutWordMap);
+        //        String content = contentMap.get("xmlText").toString();
+        //        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        //        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        //        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        //        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationInformedConsent_keyContrasts, modeId);
+        //
+        //        String text = CxXmlUtil.getXmlText(content);
+        //        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationInformedConsent_sourceTitles, text);
+        //        cutWordMap.putAll(structureMap);
+        //
+        //        OperationInformedConsentDoc operationInformedConsentDoc = ModelDocGenerate.operationInformedConsentDocGen(cutWordMap);
         OperationInformedConsentDoc operationInformedConsentDoc = new OperationInformedConsentDoc();
-//        operationInformedConsentDoc.setText(text);
-//        operationInformedConsentDoc.setPageData((Map) cutWordMap);
+        //        operationInformedConsentDoc.setText(text);
+        //        operationInformedConsentDoc.setPageData((Map) cutWordMap);
 
         return operationInformedConsentDoc;
     }
@@ -427,20 +380,20 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
 
     private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(Map<String, Object> contentMap) {
         String modeId = "21";
-//        String content = contentMap.get("xmlText").toString();
-//        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-//        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-//        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-//        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationSafetyChecklist_keyContrasts, modeId);
-//
-//        String text = CxXmlUtil.getXmlText(content);
-//        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationSafetyChecklist_sourceTitles, text);
-//        cutWordMap.putAll(structureMap);
-
-//        OperationSafetyChecklistDoc operationSafetyChecklistDoc = ModelDocGenerate.operationSafetyChecklistDocGen(cutWordMap);
+        //        String content = contentMap.get("xmlText").toString();
+        //        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        //        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        //        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        //        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationSafetyChecklist_keyContrasts, modeId);
+        //
+        //        String text = CxXmlUtil.getXmlText(content);
+        //        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationSafetyChecklist_sourceTitles, text);
+        //        cutWordMap.putAll(structureMap);
+
+        //        OperationSafetyChecklistDoc operationSafetyChecklistDoc = ModelDocGenerate.operationSafetyChecklistDocGen(cutWordMap);
         OperationSafetyChecklistDoc operationSafetyChecklistDoc = new OperationSafetyChecklistDoc();
-//        operationSafetyChecklistDoc.setText(text);
-//        operationSafetyChecklistDoc.setPageData((Map) cutWordMap);
+        //        operationSafetyChecklistDoc.setText(text);
+        //        operationSafetyChecklistDoc.setPageData((Map) cutWordMap);
 
         return operationSafetyChecklistDoc;
     }

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenRescueDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.RescueDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunRescueHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +43,7 @@ public class XiamenRescueDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunRescueHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "22");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             RescueDoc rescueDoc = ModelDocGenerate.rescueDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenStagesSummaryDocTrans.java

@@ -5,8 +5,6 @@ import com.lantone.qc.pub.model.doc.StagesSummaryDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunStagesSummaryHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +43,7 @@ public class XiamenStagesSummaryDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunStagesSummaryHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "28");
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             StagesSummaryDoc stagesSummaryDoc = ModelDocGenerate.stagesSummaryDocGen(structureMap);

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenThreeLevelWardDocTrans.java

@@ -14,8 +14,6 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunThreeLevelWardHtmlAnalysis;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -59,16 +57,7 @@ public class XiamenThreeLevelWardDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunThreeLevelWardHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "4");
         }
         if (MapUtils.isEmpty(structureMap)) {
             return;

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenTransferRecordDocTrans.java

@@ -10,9 +10,6 @@ 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.beilun.util.BeiLunHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunTransferIntoHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.BeiLunTransferOutHtmlAnalysis;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
@@ -158,16 +155,7 @@ public class XiamenTransferRecordDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = new HashMap<>();
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunTransferIntoHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "26");
         }
         //存入转入时间
         getTransDate(contentMap.get("transferInDate"), "转入时间", structureMap);
@@ -213,16 +201,7 @@ public class XiamenTransferRecordDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = new HashMap<>();
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunTransferOutHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "27");
         }
         //存入转入时间
         getTransDate(contentMap.get("transferInDate"), "转入时间", structureMap);
@@ -271,16 +250,7 @@ public class XiamenTransferRecordDocTrans extends ModelDocTrans {
         Map<String, String> structureMap = new HashMap<>();
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
-        } else {
-            String recTitle = contentMap.get("recTitle").toString();
-            String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunTransferOutHtmlAnalysis();
-            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-                structureMap.put("记录编号", contentMap.get("recId").toString());
-                structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
-            }
+            structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts, "27");
         }
         //存入转出时间
         getTransDate(contentMap.get("transferOutDate"), "转出时间", structureMap);