瀏覽代碼

字段标准化对接修改

rengb 4 年之前
父節點
當前提交
c77d43f95b
共有 33 個文件被更改,包括 42 次插入3388 次删除
  1. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunBeHospitalizedDocTrans.java
  2. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicBloodEffectDocTrans.java
  3. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicalBloodDocTrans.java
  4. 1 4
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunConsultationDocTrans.java
  5. 2 2
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCrisisValueReportDocTrans.java
  6. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCriticallyIllNoticeDocTrans.java
  7. 6 5
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathCaseDiscussDocTrans.java
  8. 2 5
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathRecordDocTrans.java
  9. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDifficultCaseDiscussDocTrans.java
  10. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDutyShiftSystemDocTrans.java
  11. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunFirstCourseRecordDocTrans.java
  12. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunLeaveHospitalDocTrans.java
  13. 3 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java
  14. 1 0
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunRescueDocTrans.java
  15. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunStagesSummaryDocTrans.java
  16. 4 9
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java
  17. 12 5
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunTransferRecordDocTrans.java
  18. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunBeHospitalizedHtmlAnalysis.java
  19. 0 166
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunBeHospitalizedHtmlAnalysisExt.java
  20. 0 13
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunClinicBloodEffectHtmlAnalysis.java
  21. 1 13
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunClinicalBloodHtmlAnalysis.java
  22. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunCrisisValueReportHtmlAnalysis.java
  23. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunDeathCaseDiscussHtmlAnalysis.java
  24. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunDutyShiftSystemHtmlAnalysis.java
  25. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunOperationHtmlAnalysis.java
  26. 0 13
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunOperationRecordHtmlAnalysis.java
  27. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunPreoperativeHtmlAnalysis.java
  28. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunRescueHtmlAnalysis.java
  29. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunStagesSummaryHtmlAnalysis.java
  30. 0 11
      trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunTransferIntoHtmlAnalysis.java
  31. 1 12
      trans/src/main/java/com/lantone/qc/trans/beilun/util/TransferOutHtmlAnalysis.java
  32. 0 103
      trans/src/main/java/com/lantone/qc/trans/beilun/util/MyTest2.java
  33. 0 2937
      trans/src/main/java/com/lantone/qc/trans/beilun/util/Mytest.java

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunBeHospitalizedDocTrans.java

@@ -28,6 +28,7 @@ public class BeiLunBeHospitalizedDocTrans extends ModelDocTrans {
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunBeHospitalizedHtmlAnalysis();
         Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+        structureMap.put("记录编号", contentMap.get("recId").toString());
         //初步诊断特殊处理
         if (structureMap.containsKey("初步诊断")) {
             String initDiag = structureMap.get("初步诊断");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicBloodEffectDocTrans.java

@@ -35,6 +35,7 @@ public class BeiLunClinicBloodEffectDocTrans extends ModelDocTrans {
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunClinicBloodEffectHtmlAnalysis();
         Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+        structureMap.put("记录编号", contentMap.get("recId").toString());
 
         ClinicBloodEffectDoc clinicBloodEffectDoc = ModelDocGenerate.clinicBloodEffectDoc(structureMap);
         clinicBloodEffectDoc.setPageData((Map) structureMap);

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicalBloodDocTrans.java

@@ -36,6 +36,7 @@ public class BeiLunClinicalBloodDocTrans extends ModelDocTrans {
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunClinicalBloodHtmlAnalysis();
         Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+        structureMap.put("记录编号", contentMap.get("recId").toString());
 
         ClinicalBloodDoc clinicalBloodDoc = ModelDocGenerate.clinicalBloodDocGen(structureMap);
         clinicalBloodDoc.setPageData((Map) structureMap);

+ 1 - 4
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunConsultationDocTrans.java

@@ -4,7 +4,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
-import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
@@ -142,9 +141,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunConsultationHtmlAnalysis();
         Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_pageDataTitles);
-
-        BeHospitalizedDoc beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);
-        beHospitalizedDoc.setPageData((Map) structureMap);
+        structureMap.put("记录编号", contentMap.get("recId").toString());
 
         ConsultationResultsDoc consultationResultsDoc = ModelDocGenerate.consultationResultsDocGen(structureMap);
         consultationResultsDoc.setText(content);

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

@@ -4,7 +4,6 @@ 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.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunClinicBloodEffectHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunCrisisValueReportHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
@@ -37,6 +36,7 @@ public class BeiLunCrisisValueReportDocTrans extends ModelDocTrans {
         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());
 
         CrisisValueReportDoc crisisValueReportDoc = ModelDocGenerate.crisisValueReportDocGen(structureMap);
         crisisValueReportDoc.setPageData((Map) structureMap);
@@ -44,7 +44,7 @@ public class BeiLunCrisisValueReportDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-        "病情记录=病情分析及处理"
+            "病情记录=病情分析及处理"
     );
 
 }

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCriticallyIllNoticeDocTrans.java

@@ -37,6 +37,7 @@ public class BeiLunCriticallyIllNoticeDocTrans extends ModelDocTrans {
         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());
 
         String text = CommonAnalysisUtil.html2String(content);
         CriticallyIllNoticeDoc criticallyIllNoticeDoc = ModelDocGenerate.criticallyIllNoticeDocGen(structureMap);

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

@@ -28,6 +28,7 @@ public class BeiLunDeathCaseDiscussDocTrans extends ModelDocTrans {
         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());
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = ModelDocGenerate.deathCaseDiscussDocGen(structureMap);
         deathCaseDiscussDoc.setPageData((Map) structureMap);
@@ -35,11 +36,11 @@ public class BeiLunDeathCaseDiscussDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-        "医生签名时间=记录时间",
-        "主持人小结意见=主持人小结",
-        "具体讨论意见=讨论内容",
-        "记录者签名=记录医生",
-        "主持人(签名)=主持人签名"
+            "医生签名时间=记录时间",
+            "主持人小结意见=主持人小结",
+            "具体讨论意见=讨论内容",
+            "记录者签名=记录医生",
+            "主持人(签名)=主持人签名"
     );
 
 }

+ 2 - 5
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathRecordDocTrans.java

@@ -29,13 +29,10 @@ public class BeiLunDeathRecordDocTrans extends ModelDocTrans {
         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());
 
         DeathRecordDoc deathRecordDoc = ModelDocGenerate.deathRecordDocGen(structureMap);
-        deathRecordDoc.setPageData((Map) structureMap);
-
-        String text = CommonAnalysisUtil.html2String(content);
-
-        deathRecordDoc.setText(text);
+        deathRecordDoc.setText(CommonAnalysisUtil.html2String(content));
         deathRecordDoc.setPageData((Map) structureMap);
         return deathRecordDoc;
     }

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDifficultCaseDiscussDocTrans.java

@@ -36,6 +36,7 @@ public class BeiLunDifficultCaseDiscussDocTrans extends ModelDocTrans {
         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());
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = ModelDocGenerate.difficultCaseDiscussDocGen(structureMap);
         difficultCaseDiscussDoc.setPageData((Map) structureMap);

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

@@ -4,7 +4,6 @@ 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.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunCrisisValueReportHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunDutyShiftSystemHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
@@ -37,6 +36,7 @@ public class BeiLunDutyShiftSystemDocTrans extends ModelDocTrans {
         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());
 
         DutyShiftSystemDoc dutyShiftSystemDoc = ModelDocGenerate.dutyShiftSystemDocGen(structureMap);
         dutyShiftSystemDoc.setText(content);

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunFirstCourseRecordDocTrans.java

@@ -35,6 +35,7 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
         //Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         sourceMap = removeSerialNumber(sourceMap);
         Map<String, String> 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);

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunLeaveHospitalDocTrans.java

@@ -32,6 +32,7 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
         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);
 
         if (StringUtils.isNotEmpty(structureMap.get("出院医嘱"))) {

+ 3 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -98,6 +98,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         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());
 
         OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
         operationDiscussionDoc.setPageData((Map) structureMap);
@@ -139,6 +140,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         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());
 
         OperationRecordDoc operationRecordDoc = ModelDocGenerate.operationRecordDocGen(structureMap);
         operationRecordDoc.setPageData((Map) structureMap);
@@ -182,6 +184,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         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());
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(structureMap);
         preoperativeDiscussionDoc.setPageData((Map) structureMap);

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunRescueDocTrans.java

@@ -36,6 +36,7 @@ public class BeiLunRescueDocTrans extends ModelDocTrans {
         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());
 
         RescueDoc rescueDoc = ModelDocGenerate.rescueDocGen(structureMap);
         rescueDoc.setPageData((Map) structureMap);

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

@@ -4,7 +4,6 @@ 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.trans.ModelDocTrans;
-import com.lantone.qc.trans.beilun.util.BeiLunCrisisValueReportHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunStagesSummaryHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
@@ -37,6 +36,7 @@ public class BeiLunStagesSummaryDocTrans extends ModelDocTrans {
         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());
 
         StagesSummaryDoc stagesSummaryDoc = ModelDocGenerate.stagesSummaryDocGen(structureMap);
         stagesSummaryDoc.setPageData((Map) structureMap);

+ 4 - 9
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java

@@ -1,9 +1,6 @@
 package com.lantone.qc.trans.beilun;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
-import com.lantone.qc.dbanaly.lt.facade.ModelHospitalFacade;
 import com.lantone.qc.dbanaly.util.KernelConstants;
 import com.lantone.qc.dbanaly.util.SpecialStorageUtil;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
@@ -16,11 +13,9 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 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.BeiLunConsultationHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunThreeLevelWardHtmlAnalysis;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.comsis.Preproc;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
@@ -60,6 +55,7 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         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());
         //structureMap.put("查房日期", structureMap.get("记录时间"));
 
         /*Map<String, String> cutWordMap = Maps.newHashMap();
@@ -193,11 +189,10 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         Pattern p = Pattern.compile("(?<=主治医师).+?(?=住院医师)");
         Matcher m = p.matcher(content);
         String result = "";
-        while(m.find())
-        {
+        while (m.find()) {
             result = m.group().trim();
         }
-        return title.contains("共同照护讨论记录") && StringUtil.isNotEmpty(result.replace(":","").replace(":",""));
+        return title.contains("共同照护讨论记录") && StringUtil.isNotEmpty(result.replace(":", "").replace(":", ""));
     }
 
     private String subTitle(String srcText) {
@@ -252,7 +247,7 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
                 Date operatorEndDate = StringUtil.parseDateTime(operatorEndDateStr);
                 if (operatorEndDate != null) {
                     long timeDifference = timeDifference(operatorEndDate, recordDate);
-                    if (timeDifference == 0){
+                    if (timeDifference == 0) {
                         continue;
                     }
                     if (timeDiff == 0 || timeDiff > timeDifference) {

+ 12 - 5
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunTransferRecordDocTrans.java

@@ -9,13 +9,18 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 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.BeiLunCrisisValueReportHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunTransferIntoHtmlAnalysis;
-import com.lantone.qc.trans.beilun.util.TransferOutHtmlAnalysis;
+import com.lantone.qc.trans.beilun.util.BeiLunTransferOutHtmlAnalysis;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @Description: 转科记录文档生成
@@ -145,6 +150,7 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
         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());
 
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setStructureMap(structureMap);
@@ -177,7 +183,7 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
         String content = contentMap.get("xmlText").toString();
         String recTitle = contentMap.get("recTitle").toString();
         String recTypeId = contentMap.get("recTypeId").toString();
-        BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunCrisisValueReportHtmlAnalysis();
+        BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunTransferOutHtmlAnalysis();
         Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
@@ -213,9 +219,10 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
         String content = contentMap.get("xmlText").toString();
         String recTitle = contentMap.get("recTitle").toString();
         String recTypeId = contentMap.get("recTypeId").toString();
-        BeiLunHtmlAnalysis beiLunHtmlAnalysis = new TransferOutHtmlAnalysis();
+        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());
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setStructureMap(structureMap);

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunBeHospitalizedHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -154,14 +153,4 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
         }
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/病例导出/日间病历-性早熟-儿科-2265411.html");
-        String recTitle = "日间病历-性早熟";
-        BeiLunBeHospitalizedHtmlAnalysis test = new BeiLunBeHospitalizedHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle);
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key));
-        });
-    }
-
 }

+ 0 - 166
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunBeHospitalizedHtmlAnalysisExt.java

@@ -1,166 +0,0 @@
-package com.lantone.qc.trans.beilun.util;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
-import com.lantone.qc.pub.util.StringUtil;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @author: rengb
- * @time: 2020/9/15 16:28
- */
-public class BeiLunBeHospitalizedHtmlAnalysisExt implements BeiLunHtmlAnalysis {
-
-    @Override
-    public Map<String, String> analysis(String... args) {
-        Map<String, String> map = Maps.newLinkedHashMap();
-        String html = args[0];
-        String recTitle = args[1];
-        Document doc = Jsoup.parse(html);
-        String msg = BeiLunHtmlAnalysisUtil.elementLayer1ToStr(doc.selectFirst("table").nextElementSibling(),false);
-        List<String> lls = Lists.newArrayList("姓名","性别","出生年月","科室","科别","床位","住院号");
-        CommonAnalysisUtil.cutByTitles(msg, lls, 0, map);
-        if (map.size()==0){
-            throw new RuntimeException("21212");
-        }
-
-        if (recTitle.contains("24小时")) {
-            analysis24h(doc, map);
-        } else if (recTitle.contains("日间病历")) {
-            analysisDay(doc, map);
-        } else {
-            analysisGeneral(doc, recTitle, map);
-        }
-
-//        BeiLunHtmlAnalysisUtil.insertModuleId(recTitle, map);
-        return map;
-    }
-
-    //一般模板
-    private void analysisGeneral(Document doc, String recTitle, Map<String, String> map) {
-        //个人基础信息table解析
-        BeiLunHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("table1"), map);
-        //主诉、现病史等table解析
-        BeiLunHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table6"), map);
-        //体 格 检 查 表(一) table解析
-        Element tgjcTableElement = doc.getElementById("table3");
-        BeiLunHtmlAnalysisUtil.tableStyle2InsertMap(tgjcTableElement, map);
-
-        //诊断 table解析
-        String disTableElementId = "table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1";
-        if (recTitle.equals("妇科大病历")) {
-            disTableElementId = "table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1_37";
-        }
-        Element disTableElement = doc.getElementById(disTableElementId);
-        BeiLunHtmlAnalysisUtil.tableStyle1InsertMap(disTableElement, map);
-        disHandleExt(map);
-
-        //医生签名、医生签名时间
-        Element docSignElement = null, docSignTimeElement = null;
-        for (Element disTableElementNt : disTableElement.nextElementSiblings()) {
-            docSignElement = disTableElementNt.selectFirst("image,img");
-            if (docSignElement != null) {
-                docSignTimeElement = disTableElementNt.nextElementSibling();
-                break;
-            }
-        }
-        if (docSignElement != null) {
-            map.put("医生签名", docSignElement.outerHtml());
-        }
-        if (docSignTimeElement != null) {
-            map.put("医生签名时间", BeiLunHtmlAnalysisUtil.elementLayer1ToStr(docSignTimeElement, false).trim());
-        }
-
-        //专科检查、辅助检查
-        Element yuElement = new Element("div");
-        for (Element tgjcTableElementNt : tgjcTableElement.nextElementSiblings()) {
-            if (tgjcTableElementNt.id().contains("table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1")) {
-                break;
-            }
-            if (tgjcTableElementNt.tagName().equals("table")) {
-                continue;
-            }
-            tgjcTableElementNt.appendTo(yuElement);
-        }
-        String yuText = BeiLunHtmlAnalysisUtil.blockDivToStr(yuElement, true)
-                .replace("体  格  检  查  表 (二)", "")
-                .replace("(补充及专科情况)", "")
-                .replace("辅  助  检  查", "辅助检查:")
-                .replace("诊断:", "")
-                .replace("补充专科情况", "补充专科情况:")
-                .trim();
-        CommonAnalysisUtil.cutByTitles(yuText, Lists.newArrayList("专科检查", "辅助检查"), 0, map);
-    }
-
-    //24小时出入院记录、24小时出入院记录(全院)、24小时入出院记录(全院通用)、24小时内入院死亡记录(全院通用)
-    private void analysis24h(Document doc, Map<String, String> map) {
-        String text = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
-        text = text.substring(text.lastIndexOf("24小时入出院记录姓    名")).replaceFirst("第1页", "");
-        List<String> titles = Lists.newArrayList("姓    名", "家庭住址", "性    别", "工作单位", "年    龄", "身份证号码", "民    族",
-                "联系人(关系)", "职    业", "入院时间", "婚    姻", "死亡时间", "记录时间", "出 生 地", "病史陈述者", "主    诉", "入院情况", "心理评估",
-                "疼痛评估", "营养评估", "功能评估", "入院诊断", "诊疗经过", "死亡原因", "死亡诊断", "出院情况", "出院诊断", "出院计划", "出院医嘱",
-                "出院去向", "医师签名", "书写时间");
-
-        CommonAnalysisUtil.cutByTitles(text, titles, 0, map);
-        CommonAnalysisUtil.processType(map, "出院去向");
-    }
-
-    //原-日间病历入出院记录、日间病历-性早熟
-    private void analysisDay(Document doc, Map<String, String> map) {
-        //个人基础信息table解析
-        BeiLunHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("table1"), map);
-        //主诉、入院情况等table解析
-        BeiLunHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table6"), map);
-        //医生签名、医生签名时间
-        Element docSignElement = null, docSignTimeElement = null;
-        for (Element table6ElementNt : doc.getElementById("table6").parent().nextElementSiblings()) {
-            docSignElement = table6ElementNt.selectFirst("image,img");
-            if (docSignElement != null) {
-                docSignTimeElement = table6ElementNt.nextElementSibling();
-                break;
-            }
-        }
-        if (docSignElement != null) {
-            map.put("医生签名", docSignElement.outerHtml());
-        }
-        if (docSignTimeElement != null) {
-            map.put("医生签名时间", BeiLunHtmlAnalysisUtil.elementLayer1ToStr(docSignTimeElement, false).trim());
-        }
-    }
-
-    private void disHandleExt(Map<String, String> map) {
-        String[] keys = { "补充诊断", "修正诊断" };
-        String value = null;
-        int index = 0;
-        for (String key : keys) {
-            value = map.get(key);
-            if (StringUtil.isNotBlank(value)) {
-                for (String key_ : keys) {
-                    index = value.indexOf(key_);
-                    if (index > 0) {
-                        map.put(key_, value.substring(index + 5));
-                        map.put(key, value.substring(0, index));
-                    }
-                }
-            }
-        }
-    }
-
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/病例导出/日间病历-性早熟-儿科-2265411.html");
-        String recTitle = "日间病历-性早熟";
-        BeiLunBeHospitalizedHtmlAnalysis test = new BeiLunBeHospitalizedHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle);
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key));
-        });
-    }
-
-}

+ 0 - 13
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunClinicBloodEffectHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -41,8 +40,6 @@ public class BeiLunClinicBloodEffectHtmlAnalysis implements BeiLunHtmlAnalysis {
         );
 
          */
-        //找不到模板id,用默认标准模板
-        map.putIfAbsent("mode_id", "415");
         BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         return map;
     }
@@ -61,14 +58,4 @@ public class BeiLunClinicBloodEffectHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunClinicBloodEffectHtmlAnalysis test = new BeiLunClinicBloodEffectHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 1 - 13
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunClinicalBloodHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -40,8 +39,7 @@ public class BeiLunClinicalBloodHtmlAnalysis implements BeiLunHtmlAnalysis {
                     }
                 }
         );
-        //找不到模板id,用默认标准模板
-        map.putIfAbsent("mode_id", "414");
+        BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         return map;
     }
 
@@ -59,14 +57,4 @@ public class BeiLunClinicalBloodHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunClinicalBloodHtmlAnalysis test = new BeiLunClinicalBloodHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunCrisisValueReportHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -44,14 +43,4 @@ public class BeiLunCrisisValueReportHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunCrisisValueReportHtmlAnalysis test = new BeiLunCrisisValueReportHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunDeathCaseDiscussHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -41,14 +40,4 @@ public class BeiLunDeathCaseDiscussHtmlAnalysis implements BeiLunHtmlAnalysis {
         return map;
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("D:\\朗通/病例导出/死亡病例讨论-EICU-2258383.html");
-        String recTitle = "死亡病例讨论";
-        BeiLunDeathCaseDiscussHtmlAnalysis test = new BeiLunDeathCaseDiscussHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle);
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunDutyShiftSystemHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -44,14 +43,4 @@ public class BeiLunDutyShiftSystemHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunDutyShiftSystemHtmlAnalysis test = new BeiLunDutyShiftSystemHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunOperationHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -44,14 +43,4 @@ public class BeiLunOperationHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/病例导出/包包_术后首程-胃肠疝血管科-2260241.html");
-        String recTitle = "术后首程-";
-        BeiLunOperationHtmlAnalysis test = new BeiLunOperationHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 13
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunOperationRecordHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
@@ -35,8 +34,6 @@ public class BeiLunOperationRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
             }
         }
         BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
-        //找不到模板id,用默认标准模板
-        map.putIfAbsent("mode_id", "407");
         return map;
     }
 
@@ -57,14 +54,4 @@ public class BeiLunOperationRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/病例导出/计划生育手术记录-妇科住院-2261951.html");
-        String recTitle = "手术记录";
-        BeiLunOperationRecordHtmlAnalysis test = new BeiLunOperationRecordHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunPreoperativeHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -54,14 +53,4 @@ public class BeiLunPreoperativeHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.processType(map, "讨论方式");
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/病例导出/术前讨论及术前小结-耳鼻喉科-2258069.html");
-        String recTitle = "术前讨论及术前小结";
-        BeiLunPreoperativeHtmlAnalysis test = new BeiLunPreoperativeHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunRescueHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -44,14 +43,4 @@ public class BeiLunRescueHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunRescueHtmlAnalysis test = new BeiLunRescueHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunStagesSummaryHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -44,14 +43,4 @@ public class BeiLunStagesSummaryHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunStagesSummaryHtmlAnalysis test = new BeiLunStagesSummaryHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 11
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunTransferIntoHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -44,14 +43,4 @@ public class BeiLunTransferIntoHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        BeiLunTransferIntoHtmlAnalysis test = new BeiLunTransferIntoHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 1 - 12
trans/src/main/java/com/lantone/qc/trans/beilun/util/TransferOutHtmlAnalysis.java

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.beilun.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -14,7 +13,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/9/28 20:22
  */
-public class TransferOutHtmlAnalysis implements BeiLunHtmlAnalysis {
+public class BeiLunTransferOutHtmlAnalysis implements BeiLunHtmlAnalysis {
 
     private String modeId = "27";
 
@@ -44,14 +43,4 @@ public class TransferOutHtmlAnalysis implements BeiLunHtmlAnalysis {
         CommonAnalysisUtil.cutByTitlesNoColon(bqjlText, titles, 0, map);
     }
 
-    public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/分类/消化内科/红细胞输注病程记录/106000157270.odt.html");
-        String recTitle = "术后首程-";
-        TransferOutHtmlAnalysis test = new TransferOutHtmlAnalysis();
-        Map<String, String> map = test.analysis(html, recTitle, "");
-        map.keySet().forEach(key -> {
-            System.out.println(key + "-----" + map.get(key).replaceAll("\n", ""));
-        });
-    }
-
 }

+ 0 - 103
trans/src/main/java/com/lantone/qc/trans/beilun/util/MyTest2.java

@@ -1,103 +0,0 @@
-package com.lantone.qc.trans.beilun.util;
-
-import com.lantone.qc.pub.util.FileUtil;
-import com.lantone.qc.trans.beilun.util.ez.EzXmlAnalysis;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @Description:
- * @author: rengb
- * @time: 2020/9/23 11:12
- */
-public class MyTest2 {
-
-    public static void main(String[] args) throws Exception {
-        puda();
-    }
-
-    public static void puda(){
-        File file = new File("C:\\Users\\Administrator\\Desktop\\宁波\\病例导出");
-        for (File f1 : file.listFiles()) {
-            String html = FileUtil.fileRead(f1.getPath());
-            Pattern pattern = Pattern.compile("[0-9]+.odt");
-            Matcher matcher = pattern.matcher(html);
-            if (matcher.find()){
-                System.out.println(matcher.group());
-            }
-        }
-    }
-
-
-    public static void ez()throws Exception{
-        Set<String> set = new HashSet<>();
-        File file1 = new File("C:\\Users\\Administrator\\Desktop\\恩泽\\入院记录");
-        for (File f1 : file1.listFiles()) {
-            for (File f2 : f1.listFiles()) {
-                String xml = bom(FileUtil.fileRead(f2.getPath()));
-                Map<String, String> map = EzXmlAnalysis.analysis("小儿外科", xml);
-                set.addAll(map.keySet());
-            }
-        }
-
-        set.forEach(i -> {
-            System.out.println(i);
-        });
-    }
-
-    public static void jx() throws Exception {
-        File file = new File("C:\\Users\\Administrator\\Desktop\\恩泽\\入院记录\\骨科入院记录(通用)");
-        Set<Integer> set = new HashSet<>();
-        for (File listFile : file.listFiles()) {
-            try {
-                Document doc = DocumentHelper.parseText(bom(FileUtil.fileRead(listFile.getPath())));
-                List<Element> elements = doc.getRootElement().elements();
-                set.add(elements.size());
-            } catch (Exception e) {
-                System.out.println(listFile.getName());
-            }
-        }
-    }
-
-    public static void jx2() throws Exception {
-        String xml = bom(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\恩泽\\JhmrFileContentCdaExport\\1688196_产科入院记录(小).txt"));
-        Map<String, String> map = EzXmlAnalysis.analysis("小儿外科", xml);
-        map.keySet().forEach(key -> {
-            System.out.println(key + "----" + map.get(key));
-        });
-    }
-
-    public static String bom(String result) {
-        if (null != result && !"".equals(result)) {
-            if (result.indexOf("<") != -1 && result.lastIndexOf(">") != -1 && result.lastIndexOf(">") > result.indexOf("<")) {
-                result = result.substring(result.indexOf("<"), result.lastIndexOf(">") + 1);
-            }
-        }
-        return result;
-    }
-
-
-    public static String xmls(Element element) {
-        String ret = "";
-        List<Element> elements = element.elements();
-        if (elements.size() > 0) {
-            elements.forEach(element1 -> {
-
-            });
-        } else {
-            ret += element.getStringValue();
-        }
-
-        return null;
-    }
-
-}

File diff suppressed because it is too large
+ 0 - 2937
trans/src/main/java/com/lantone/qc/trans/beilun/util/Mytest.java