Procházet zdrojové kódy

字段标准化修改

rengb před 4 roky
rodič
revize
fc6e429c06

+ 12 - 13
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunConsultationDocTrans.java

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.pub.util.StringUtil;
@@ -136,12 +137,17 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
 
     private ConsultationResultsDoc getConsultationResultsDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_pageDataTitles);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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, consultationResults_pageDataTitles);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         ConsultationResultsDoc consultationResultsDoc = ModelDocGenerate.consultationResultsDocGen(structureMap);
         consultationResultsDoc.setText(content);
@@ -156,13 +162,6 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
             "患者病情及诊疗经过、申请会诊的理由及目的=会诊目的",
             "记录医师"
     );
-    private List<String> consultationResults_sourceTitles = Lists.newArrayList(
-            "病程记录时间",
-            "病程记录名称",
-            "病程记录内容",
-            "记录时间",
-            "记录医师"
-    );
 
 
     /**************************************************会诊申请单*******************************************************/

+ 12 - 6
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCrisisValueReportDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -31,12 +32,17 @@ public class BeiLunCrisisValueReportDocTrans extends ModelDocTrans {
 
     private CrisisValueReportDoc getCrisisValueReportDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         CrisisValueReportDoc crisisValueReportDoc = ModelDocGenerate.crisisValueReportDocGen(structureMap);
         crisisValueReportDoc.setPageData((Map) structureMap);

+ 13 - 27
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCriticallyIllNoticeDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -32,12 +33,17 @@ public class BeiLunCriticallyIllNoticeDocTrans extends ModelDocTrans {
 
     private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         String text = CommonAnalysisUtil.html2String(content);
         CriticallyIllNoticeDoc criticallyIllNoticeDoc = ModelDocGenerate.criticallyIllNoticeDocGen(structureMap);
@@ -47,28 +53,8 @@ public class BeiLunCriticallyIllNoticeDocTrans extends ModelDocTrans {
         return criticallyIllNoticeDoc;
     }
 
-    private List<String> sourceTitles = Lists.newArrayList(
-            "记录时间",
-            "记录医师",
-            "姓名",
-            "性别",
-            "病区",
-            "床号",
-            "病案号",
-            "目前诊断",
-            "签名",
-            "签名时间"
-    );
-
     private List<String> keyContrasts = Lists.newArrayList(
-            "姓名++++患者姓名=姓名",
-            "性别=",
-            "病区++++病区名称=病区",
-            "床号=",
-            "病案号++++住院号=病案号",
-            "目前诊断++++初步诊断=目前诊断",
-            "签名++++=签名",
-            "签名时间="
+            
     );
 
 }

+ 12 - 6
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathCaseDiscussDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -23,12 +24,17 @@ public class BeiLunDeathCaseDiscussDocTrans extends ModelDocTrans {
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = ModelDocGenerate.deathCaseDiscussDocGen(structureMap);
         deathCaseDiscussDoc.setPageData((Map) structureMap);

+ 12 - 38
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathRecordDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -24,12 +25,17 @@ public class BeiLunDeathRecordDocTrans extends ModelDocTrans {
     public DeathRecordDoc extract(MedrecVo medrecVo) {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         DeathRecordDoc deathRecordDoc = ModelDocGenerate.deathRecordDocGen(structureMap);
         deathRecordDoc.setText(CommonAnalysisUtil.html2String(content));
@@ -37,39 +43,7 @@ public class BeiLunDeathRecordDocTrans extends ModelDocTrans {
         return deathRecordDoc;
     }
 
-    private List<String> sourceTitles = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "科别",
-            "床号",
-            "病案号",
-            "年龄",
-            "入院时间",
-            "死亡时间",
-            "入院情况",
-            "发病经过",
-            "入院诊断",
-            "诊疗经过",
-            "死亡原因",
-            "死亡诊断",
-            "记录医师",
-            "记录时间"
-    );
-
     private List<String> keyContrasts = Lists.newArrayList(
-            "姓名++++患者姓名=姓名",
-            "性别=",
-            "病区++++病区名称=",
-            "床号=",
-            "病案号++++住院号=病案号",
-            "入院时间=",
-            "死亡时间=",
-            "入院情况=",
-            "入院诊断++++初步诊断=入院诊断",
-            "诊疗经过=",
-            "死亡原因=",
-            "死亡诊断++++初步诊断=死亡诊断",
-            "签名++++=记录医师",
             "签名时间=记录时间"
     );
 

+ 12 - 6
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDifficultCaseDiscussDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -31,12 +32,17 @@ public class BeiLunDifficultCaseDiscussDocTrans extends ModelDocTrans {
 
     private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = ModelDocGenerate.difficultCaseDiscussDocGen(structureMap);
         difficultCaseDiscussDoc.setPageData((Map) structureMap);

+ 12 - 8
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDutyShiftSystemDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -31,17 +32,20 @@ public class BeiLunDutyShiftSystemDocTrans extends ModelDocTrans {
 
     private DutyShiftSystemDoc getDutyShiftSystemDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         DutyShiftSystemDoc dutyShiftSystemDoc = ModelDocGenerate.dutyShiftSystemDocGen(structureMap);
-        dutyShiftSystemDoc.setText(content);
         dutyShiftSystemDoc.setPageData((Map) structureMap);
-
         return dutyShiftSystemDoc;
     }
 

+ 15 - 44
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunFirstCourseRecordDocTrans.java

@@ -4,13 +4,13 @@ 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.StringUtil;
+import com.lantone.qc.pub.util.FastJsonUtils;
 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.beilun.util.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.comsis.Preproc;
 
 import java.util.List;
 import java.util.Map;
@@ -28,17 +28,20 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
-        String recTitle = contentMap.get("recTitle").toString();
-        String recTypeId = contentMap.get("recTypeId").toString();
-        BeiLunFirstCourseRecordHtmlAnalysis beiLunFirstCourseRecordHtmlAnalysis = new BeiLunFirstCourseRecordHtmlAnalysis();
-        Map<String, String> sourceMap = beiLunFirstCourseRecordHtmlAnalysis.analysis(content, recTitle, recTypeId);
-        //Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        sourceMap = removeSerialNumber(sourceMap);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            sourceMap = removeSerialNumber(sourceMap);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
+        
         String text = CommonAnalysisUtil.html2String(content);
-        //Map<String, String> cutWordMap = getCutWordMap(text);
-        //cutWordMap.putAll(structureMap);
         FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
         firstCourseRecordDoc.setText(text);
         firstCourseRecordDoc.setPageData((Map) structureMap);
@@ -54,38 +57,6 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
         return structureMap;
     }
 
-    private Map<String, String> getCutWordMap(String content) {
-        Map<String, String> retMap = Maps.newHashMap();
-        if (StringUtil.isBlank(content)) {
-            return retMap;
-        }
-        List<String> targetTitles = Lists.newArrayList();
-        sourceTitles.forEach(sourceTitle -> {
-            String targetTitle = "[一二三四五六七八九十]{0,1}[、.]{0,1}";
-            for (int index = 0; index < sourceTitle.length(); index++) {
-                if (index == sourceTitle.length() - 1) {
-                    targetTitle += sourceTitle.substring(index, index + 1);
-                } else {
-                    targetTitle += sourceTitle.substring(index, index + 1) + "[\\s\\p{Zs}]*";
-                }
-            }
-            targetTitles.add(targetTitle);
-        });
-        Map<String, String> sourceMap = Preproc.extract_doc_pub(true, targetTitles, content);
-        for (String key : sourceMap.keySet()) {
-            retMap.put(key.replaceAll("[一二三四五六七八九十、.]", ""), sourceMap.get(key));
-        }
-        return retMap;
-    }
-
-    private List<String> sourceTitles = Lists.newArrayList(
-            "病例特点",
-            "初步诊断",
-            "诊断依据",
-            "鉴别诊断",
-            "诊疗计划"
-    );
-
     private List<String> keyContrasts = Lists.newArrayList(
             "时间=病历日期",
             "病历特点=病例特点",

+ 14 - 12
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunLeaveHospitalDocTrans.java

@@ -5,7 +5,9 @@ import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 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.beilun.util.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
@@ -26,15 +28,19 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
-        String recTitle = contentMap.get("recTitle").toString();
-        String recTypeId = contentMap.get("recTypeId").toString();
-        BeiLunLeaveHospitalHtmlAnalysis beiLunLeaveHospitalHtmlAnalysis = new BeiLunLeaveHospitalHtmlAnalysis();
-        Map<String, String> sourceMap = beiLunLeaveHospitalHtmlAnalysis.analysis(content, recTitle, recTypeId);
-//        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
-        LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
+        LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);
         if (StringUtils.isNotEmpty(structureMap.get("出院医嘱"))) {
             LeaveHospitalDoctorAdviceLabel leaveHospitalDoctorAdviceLabel = new LeaveHospitalDoctorAdviceLabel();
             leaveHospitalDoctorAdviceLabel.setText(structureMap.get("出院医嘱"));
@@ -53,8 +59,6 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
             "床号=",
             "年龄=",
             "科室=科别",
-            //"入院日期=入院时间",
-            //"出院日期=出院时间",
             "入院诊断=入院诊断",
             "出院诊断=出院诊断",
             "实际住院天数=住院天数",
@@ -62,11 +66,9 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
             "诊疗经过=诊治经过",
             "出院情况=",
             "出院医嘱=",
-            /*           "健康教育=注意事项",*/
             "随访计划=",
             "医师签名=记录医生",
             "时间=记录时间"
-            //"日期=出院时间"
     );
 
 }

+ 34 - 18
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
 import com.lantone.qc.pub.model.doc.operation.PreoperativeDiscussionDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+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;
@@ -83,12 +84,17 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
 
     private OperationDiscussionDoc getOperationDiscussionDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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 BeiLunOperationHtmlAnalysis();
+            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
         operationDiscussionDoc.setPageData((Map) structureMap);
@@ -125,12 +131,17 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
 
     private OperationRecordDoc getOperationRecordDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         OperationRecordDoc operationRecordDoc = ModelDocGenerate.operationRecordDocGen(structureMap);
         operationRecordDoc.setPageData((Map) structureMap);
@@ -169,12 +180,17 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
 
     private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(structureMap);
         preoperativeDiscussionDoc.setPageData((Map) structureMap);

+ 12 - 6
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunRescueDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -31,12 +32,17 @@ public class BeiLunRescueDocTrans extends ModelDocTrans {
 
     private RescueDoc getRescueDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         RescueDoc rescueDoc = ModelDocGenerate.rescueDocGen(structureMap);
         rescueDoc.setPageData((Map) structureMap);

+ 12 - 6
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunStagesSummaryDocTrans.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 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;
@@ -31,12 +32,17 @@ public class BeiLunStagesSummaryDocTrans extends ModelDocTrans {
 
     private StagesSummaryDoc getStagesSummaryDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         StagesSummaryDoc stagesSummaryDoc = ModelDocGenerate.stagesSummaryDocGen(structureMap);
         stagesSummaryDoc.setPageData((Map) structureMap);

+ 12 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.model.doc.ward.DirectorDoctorWardDoc;
 import com.lantone.qc.pub.model.doc.ward.GeneralDoctorWardDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+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;
@@ -50,12 +51,17 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
 
     private void classifyThreeLevelWardDoc(ThreeLevelWardDoc threeLevelWardDoc, Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
         //structureMap.put("查房日期", structureMap.get("记录时间"));
 
         /*Map<String, String> cutWordMap = Maps.newHashMap();
@@ -202,11 +208,6 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         return srcText;
     }
 
-    private List<String> sourceTitles = Lists.newArrayList(
-            "医师签名",
-            "记录医生"
-    );
-
     private List<String> keyContrasts = Lists.newArrayList(
             "病历日期=查房日期",
             "病历标题=查房标题",

+ 34 - 17
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunTransferRecordDocTrans.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.doc.transferrecord.TransferIntoDoc;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferOutDoc;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+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;
@@ -145,12 +146,17 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
 
     private TransferIntoDoc getTransferIntoDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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 BeiLunTransferIntoHtmlAnalysis();
+            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setStructureMap(structureMap);
@@ -181,11 +187,17 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
 
     private TransferRecordDoc getTransferAllDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+        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 BeiLunTransferOutHtmlAnalysis();
+            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
         transferAllDoc.setStructureMap(structureMap);
@@ -217,12 +229,17 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
 
     private TransferOutDoc getTransferOutDoc(Map<String, Object> contentMap) {
         String content = contentMap.get("xmlText").toString();
-        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);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("记录编号", contentMap.get("recId").toString());
+        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 BeiLunTransferOutHtmlAnalysis();
+            Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+            structureMap.put("记录编号", contentMap.get("recId").toString());
+        }
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setStructureMap(structureMap);

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunFirstCourseRecordHtmlAnalysis.java

@@ -47,9 +47,9 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
             }
         }
         BeiLunHtmlAnalysisUtil.insertModuleId(modeId, args[2], structureMap);
-//        CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
-//        structureMap.forEach((k,v)-> System.out.println(k + "------" + v));
-//        structureMap.put("rec_title=", "107");
+        //        CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
+        //        structureMap.forEach((k,v)-> System.out.println(k + "------" + v));
+        //        structureMap.put("rec_title=", "107");
 
         return structureMap;
     }