余杭三院修改类名

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

@@ -5,7 +5,7 @@ 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.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.yuhangsy.util.YhsyADLGradeHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyADLGradeHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -20,7 +20,7 @@ import java.util.Map;
  * @Version 1.0
  */
 @Slf4j
-public class YhsyADLGradeDocTrans extends ModelDocTrans {
+public class YuhangsyADLGradeDocTrans extends ModelDocTrans {
     @Override
     public ADLGradeDoc extract(MedrecVo medrecVo) {
         ADLGradeDoc adlGradeDoc = null;
@@ -33,7 +33,7 @@ public class YhsyADLGradeDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyADLGradeHtmlAnalysis adlGradeHtmlAnalysis = new YhsyADLGradeHtmlAnalysis();
+                YuhangsyADLGradeHtmlAnalysis adlGradeHtmlAnalysis = new YuhangsyADLGradeHtmlAnalysis();
                 Map<String, String> sourceMap = adlGradeHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap.putAll(sourceMap);

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyBeHospitalizedHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyBeHospitalizedHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/5 15:47
  */
 @Slf4j
-public class YhsyBeHospitalizedDocTrans extends ModelDocTrans {
+public class YuhangsyBeHospitalizedDocTrans extends ModelDocTrans {
 
     @Override
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
@@ -35,7 +35,7 @@ public class YhsyBeHospitalizedDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyBeHospitalizedHtmlAnalysis();
+                YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyBeHospitalizedHtmlAnalysis();
                 Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyClinicBloodEffectHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyClinicBloodEffectHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @desc 输血后效果评价
  **/
 @Slf4j
-public class YhsyClinicBloodEffectDocTrans extends ModelDocTrans {
+public class YuhangsyClinicBloodEffectDocTrans extends ModelDocTrans {
 
     @Override
     public List<ClinicBloodEffectDoc> extract(MedrecVo medrecVo) {
@@ -48,7 +48,7 @@ public class YhsyClinicBloodEffectDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyClinicBloodEffectHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyClinicBloodEffectHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -8,8 +8,8 @@ import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyClinicalBloodHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyClinicalBloodHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -22,7 +22,7 @@ import java.util.Map;
  * @time: 2020/3/17 13:21
  */
 @Slf4j
-public class YhsyClinicalBloodDocTrans extends ModelDocTrans {
+public class YuhangsyClinicalBloodDocTrans extends ModelDocTrans {
 
     @Override
     public List<ClinicalBloodDoc> extract(MedrecVo medrecVo) {
@@ -49,7 +49,7 @@ public class YhsyClinicalBloodDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyClinicalBloodHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyClinicalBloodHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -14,9 +14,9 @@ import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyConsultationHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyConsultationRecordHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyConsultationHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyConsultationRecordHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -30,7 +30,7 @@ import java.util.Set;
  * @time: 2020/3/17 13:22
  */
 @Slf4j
-public class YhsyConsultationDocTrans extends ModelDocTrans {
+public class YuhangsyConsultationDocTrans extends ModelDocTrans {
 
     @Override
     public List<ConsultationDoc> extract(MedrecVo medrecVo) {
@@ -98,7 +98,7 @@ public class YhsyConsultationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyConsultationRecordHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyConsultationRecordHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts);
@@ -159,7 +159,7 @@ public class YhsyConsultationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyConsultationHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyConsultationHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_pageDataTitles);
@@ -226,7 +226,7 @@ public class YhsyConsultationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyConsultationHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyConsultationHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/3/19 19:41
  */
-public class YhsyCrisisInfoDocTrans extends ModelDocTrans {
+public class YuhangsyCrisisInfoDocTrans extends ModelDocTrans {
 
     @Override
     public List<CrisisInfoDoc> extract(MedrecVo medrecVo) {

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyCrisisValueReportHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyCrisisValueReportHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/19 19:41
  */
 @Slf4j
-public class YhsyCrisisValueReportDocTrans extends ModelDocTrans {
+public class YuhangsyCrisisValueReportDocTrans extends ModelDocTrans {
 
     @Override
     public List<CrisisValueReportDoc> extract(MedrecVo medrecVo) {
@@ -48,7 +48,7 @@ public class YhsyCrisisValueReportDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyCrisisValueReportHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyCrisisValueReportHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -8,8 +8,8 @@ import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyCriticallyIllNoticeHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyCriticallyIllNoticeHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -22,7 +22,7 @@ import java.util.Map;
  * @time: 2020/3/19 19:41
  */
 @Slf4j
-public class YhsyCriticallyIllNoticeDocTrans extends ModelDocTrans {
+public class YuhangsyCriticallyIllNoticeDocTrans extends ModelDocTrans {
 
     @Override
     public List<CriticallyIllNoticeDoc> extract(MedrecVo medrecVo) {
@@ -49,7 +49,7 @@ public class YhsyCriticallyIllNoticeDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyCriticallyIllNoticeHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyCriticallyIllNoticeHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyDeathCaseDiscussHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyDeathCaseDiscussHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/17 13:22
  */
 @Slf4j
-public class YhsyDeathCaseDiscussDocTrans extends ModelDocTrans {
+public class YuhangsyDeathCaseDiscussDocTrans extends ModelDocTrans {
 
     @Override
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
@@ -35,7 +35,7 @@ public class YhsyDeathCaseDiscussDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyDeathCaseDiscussHtmlAnalysis();
+                YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyDeathCaseDiscussHtmlAnalysis();
                 Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -8,8 +8,8 @@ import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyDeathRecordHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyDeathRecordHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -22,7 +22,7 @@ import java.util.Map;
  * @time: 2020/3/17 13:23
  */
 @Slf4j
-public class YhsyDeathRecordDocTrans extends ModelDocTrans {
+public class YuhangsyDeathRecordDocTrans extends ModelDocTrans {
 
     @Override
     public DeathRecordDoc extract(MedrecVo medrecVo) {
@@ -36,7 +36,7 @@ public class YhsyDeathRecordDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyDeathRecordHtmlAnalysis();
+                YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyDeathRecordHtmlAnalysis();
                 Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyDifficultCaseDiscussHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyDifficultCaseDiscussHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/17 13:23
  */
 @Slf4j
-public class YhsyDifficultCaseDiscussDocTrans extends ModelDocTrans {
+public class YuhangsyDifficultCaseDiscussDocTrans extends ModelDocTrans {
 
     @Override
     public List<DifficultCaseDiscussDoc> extract(MedrecVo medrecVo) {
@@ -48,7 +48,7 @@ public class YhsyDifficultCaseDiscussDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyDifficultCaseDiscussHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyDifficultCaseDiscussHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (!sourceMap.containsKey("具体讨论意见") && sourceMap.containsKey("参加人员")) {
                 String participant = sourceMap.get("参加人员");

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

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * @Date: 2020-03-03 19:47
  */
 @Slf4j
-public class YhsyDocTrans extends DocTrans {
+public class YuhangsyDocTrans extends DocTrans {
 
     @Override
     protected InputInfo extract(QueryVo queryVo) {
@@ -28,118 +28,118 @@ public class YhsyDocTrans extends DocTrans {
         for (MedrecVo i : queryVo.getMedrec()) {
             if (i.getTitle() != null) {
                 if (i.getTitle().equals("会诊")) {
-                    YhsyConsultationDocTrans consultationDocTrans = new YhsyConsultationDocTrans();
+                    YuhangsyConsultationDocTrans consultationDocTrans = new YuhangsyConsultationDocTrans();
                     inputInfo.setConsultationDocs(consultationDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("手术")) {
-                    YhsyOperationDocTrans operationDocTrans = new YhsyOperationDocTrans();
+                    YuhangsyOperationDocTrans operationDocTrans = new YuhangsyOperationDocTrans();
                     inputInfo.setOperationDocs(operationDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("转科")) {
-                    YhsyTransferRecordDocTrans transferRecordDocTrans = new YhsyTransferRecordDocTrans();
+                    YuhangsyTransferRecordDocTrans transferRecordDocTrans = new YuhangsyTransferRecordDocTrans();
                     inputInfo.setTransferRecordDocs(transferRecordDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("入院记录")) {
-                    YhsyBeHospitalizedDocTrans beHospitalizedDocTrans = new YhsyBeHospitalizedDocTrans();
+                    YuhangsyBeHospitalizedDocTrans beHospitalizedDocTrans = new YuhangsyBeHospitalizedDocTrans();
                     inputInfo.setBeHospitalizedDoc(beHospitalizedDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("输血/血制品病程记录")) {
-                    YhsyClinicalBloodDocTrans clinicalBloodDocTrans = new YhsyClinicalBloodDocTrans();
+                    YuhangsyClinicalBloodDocTrans clinicalBloodDocTrans = new YuhangsyClinicalBloodDocTrans();
                     inputInfo.setClinicalBloodDocs(clinicalBloodDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("输血后效果评价")) {
-                    YhsyClinicBloodEffectDocTrans clinicBloodEffectDocTrans = new YhsyClinicBloodEffectDocTrans();
+                    YuhangsyClinicBloodEffectDocTrans clinicBloodEffectDocTrans = new YuhangsyClinicBloodEffectDocTrans();
                     inputInfo.setClinicBloodEffectDocs(clinicBloodEffectDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("危急值记录")) {
-                    YhsyCrisisValueReportDocTrans crisisValueReportDocTrans = new YhsyCrisisValueReportDocTrans();
+                    YuhangsyCrisisValueReportDocTrans crisisValueReportDocTrans = new YuhangsyCrisisValueReportDocTrans();
                     inputInfo.setCrisisValueReportDocs(crisisValueReportDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("危急值")) {
-                    YhsyCrisisInfoDocTrans crisisInfoDocTrans = new YhsyCrisisInfoDocTrans();
+                    YuhangsyCrisisInfoDocTrans crisisInfoDocTrans = new YuhangsyCrisisInfoDocTrans();
                     inputInfo.setCrisisInfoDocs(crisisInfoDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("病危通知书")) {
-                    YhsyCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new YhsyCriticallyIllNoticeDocTrans();
+                    YuhangsyCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new YuhangsyCriticallyIllNoticeDocTrans();
                     inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("死亡病例讨论记录")) {
-                    YhsyDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new YhsyDeathCaseDiscussDocTrans();
+                    YuhangsyDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new YuhangsyDeathCaseDiscussDocTrans();
                     inputInfo.setDeathCaseDiscussDoc(deathCaseDiscussDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("死亡记录")) {
-                    YhsyDeathRecordDocTrans deathRecordDocTrans = new YhsyDeathRecordDocTrans();
+                    YuhangsyDeathRecordDocTrans deathRecordDocTrans = new YuhangsyDeathRecordDocTrans();
                     inputInfo.setDeathRecordDoc(deathRecordDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("疑难病例讨论记录")) {
-                    YhsyDifficultCaseDiscussDocTrans difficultCaseDiscussDocTrans = new YhsyDifficultCaseDiscussDocTrans();
+                    YuhangsyDifficultCaseDiscussDocTrans difficultCaseDiscussDocTrans = new YuhangsyDifficultCaseDiscussDocTrans();
                     inputInfo.setDifficultCaseDiscussDocs(difficultCaseDiscussDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("医嘱信息")) {
-                    YhsyDoctorAdviceDocTrans doctorAdviceDocTrans = new YhsyDoctorAdviceDocTrans();
+                    YuhangsyDoctorAdviceDocTrans doctorAdviceDocTrans = new YuhangsyDoctorAdviceDocTrans();
                     inputInfo.setDoctorAdviceDocs(doctorAdviceDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("值班交接制度")) {
-                    YhsyDutyShiftSystemDocTrans dutyShiftSystemDocTrans = new YhsyDutyShiftSystemDocTrans();
+                    YuhangsyDutyShiftSystemDocTrans dutyShiftSystemDocTrans = new YuhangsyDutyShiftSystemDocTrans();
                     inputInfo.setDutyShiftSystemDocs(dutyShiftSystemDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("首次病程录")) {
-                    YhsyFirstCourseRecordDocTrans firstCourseRecordDocTrans = new YhsyFirstCourseRecordDocTrans();
+                    YuhangsyFirstCourseRecordDocTrans firstCourseRecordDocTrans = new YuhangsyFirstCourseRecordDocTrans();
                     inputInfo.setFirstCourseRecordDoc(firstCourseRecordDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("病案首页")) {
-                    YhsyFirstPageRecordDocTrans firstPageRecordDocTrans = new YhsyFirstPageRecordDocTrans();
+                    YuhangsyFirstPageRecordDocTrans firstPageRecordDocTrans = new YuhangsyFirstPageRecordDocTrans();
                     inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("出院小结")) {
-                    YhsyLeaveHospitalDocTrans leaveHospitalDocTrans = new YhsyLeaveHospitalDocTrans();
+                    YuhangsyLeaveHospitalDocTrans leaveHospitalDocTrans = new YuhangsyLeaveHospitalDocTrans();
                     inputInfo.setLeaveHospitalDoc(leaveHospitalDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("抢救记录")) {
-                    YhsyRescueDocTrans rescueDocTrans = new YhsyRescueDocTrans();
+                    YuhangsyRescueDocTrans rescueDocTrans = new YuhangsyRescueDocTrans();
                     inputInfo.setRescueDocs(rescueDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("阶段小结")) {
-                    YhsyStagesSummaryDocTrans stagesSummaryDocTrans = new YhsyStagesSummaryDocTrans();
+                    YuhangsyStagesSummaryDocTrans stagesSummaryDocTrans = new YuhangsyStagesSummaryDocTrans();
                     inputInfo.setStagesSummaryDocs(stagesSummaryDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("查房记录")) {
-                    YhsyThreeLevelWardDocTrans threeLevelWardDocTrans = new YhsyThreeLevelWardDocTrans();
+                    YuhangsyThreeLevelWardDocTrans threeLevelWardDocTrans = new YuhangsyThreeLevelWardDocTrans();
                     threeLevelWardDocTrans.setOperationDocs(inputInfo.getOperationDocs());
                     inputInfo.setThreeLevelWardDocs(threeLevelWardDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("住院病历信息")) {
-                    YhsyMedicalRecordInfoDocTrans medicalRecordInfoDocTrans = new YhsyMedicalRecordInfoDocTrans();
+                    YuhangsyMedicalRecordInfoDocTrans medicalRecordInfoDocTrans = new YuhangsyMedicalRecordInfoDocTrans();
                     inputInfo.setMedicalRecordInfoDoc(medicalRecordInfoDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("化验")) {
-                    YhsyLisDocTrans lisDocTrans = new YhsyLisDocTrans();
+                    YuhangsyLisDocTrans lisDocTrans = new YuhangsyLisDocTrans();
                     inputInfo.setLisDocs(lisDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("辅检")) {
-                    YhsyPacsDocTrans pacsDocTrans = new YhsyPacsDocTrans();
+                    YuhangsyPacsDocTrans pacsDocTrans = new YuhangsyPacsDocTrans();
                     inputInfo.setPacsDocs(pacsDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("门诊")) {
-                    YhsyOutDepDocTrans outDepDocTrans = new YhsyOutDepDocTrans();
+                    YuhangsyOutDepDocTrans outDepDocTrans = new YuhangsyOutDepDocTrans();
                     inputInfo.setBeHospitalizedDoc(outDepDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("知情同意书")) {
-                    YhsyInformedConsentDocTrans informedConsentDocTrans = new YhsyInformedConsentDocTrans();
+                    YuhangsyInformedConsentDocTrans informedConsentDocTrans = new YuhangsyInformedConsentDocTrans();
                     inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("有创操作")) {
-                    YhsyInvasiveOperationDocTrans invasiveOperationDocTrans = new YhsyInvasiveOperationDocTrans();
+                    YuhangsyInvasiveOperationDocTrans invasiveOperationDocTrans = new YuhangsyInvasiveOperationDocTrans();
                     inputInfo.setInvasiveOperationDocs(invasiveOperationDocTrans.extract(i));
                 }
                 /*******************************VTE评分 trans解析*****************************************/
                 if (i.getTitle().equals("VTE评分")) {
-                    YhsyVTEGradeDocTrans vteGradeDocTrans = new YhsyVTEGradeDocTrans();
+                    YuhangsyVTEGradeDocTrans vteGradeDocTrans = new YuhangsyVTEGradeDocTrans();
                     inputInfo.setVteGradeDoc(vteGradeDocTrans.extract(i));
                 }
                 /*******************************ADL评分 trans解析*****************************************/
                 if (i.getTitle().equals("ADL评分")) {
-                    YhsyADLGradeDocTrans adlGradeDocTrans = new YhsyADLGradeDocTrans();
+                    YuhangsyADLGradeDocTrans adlGradeDocTrans = new YuhangsyADLGradeDocTrans();
                     inputInfo.setAdlGradeDoc(adlGradeDocTrans.extract(i));
                 }
                 /*******************************手麻记录 trans解析*****************************************/
@@ -149,12 +149,12 @@ public class YhsyDocTrans extends DocTrans {
                 }
                 /*******************************VTE评分 trans解析*****************************************/
                 if (i.getTitle().equals("VTE评分")) {
-                    YhsyVTEGradeDocTrans vteGradeDocTrans = new YhsyVTEGradeDocTrans();
+                    YuhangsyVTEGradeDocTrans vteGradeDocTrans = new YuhangsyVTEGradeDocTrans();
                     inputInfo.setVteGradeDoc(vteGradeDocTrans.extract(i));
                 }
                 /*******************************ADL评分 trans解析*****************************************/
                 if (i.getTitle().equals("ADL评分")) {
-                    YhsyADLGradeDocTrans adlGradeDocTrans = new YhsyADLGradeDocTrans();
+                    YuhangsyADLGradeDocTrans adlGradeDocTrans = new YuhangsyADLGradeDocTrans();
                     inputInfo.setAdlGradeDoc(adlGradeDocTrans.extract(i));
                 }
                 /*******************************手麻记录 trans解析*****************************************/

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/3/19 19:41
  */
-public class YhsyDoctorAdviceDocTrans extends ModelDocTrans {
+public class YuhangsyDoctorAdviceDocTrans extends ModelDocTrans {
 
     @Override
     public List<DoctorAdviceDoc> extract(MedrecVo medrecVo) {

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyDutyShiftSystemHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyDutyShiftSystemHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/17 13:24
  */
 @Slf4j
-public class YhsyDutyShiftSystemDocTrans extends ModelDocTrans {
+public class YuhangsyDutyShiftSystemDocTrans extends ModelDocTrans {
 
     @Override
     public List<DutyShiftSystemDoc> extract(MedrecVo medrecVo) {
@@ -48,7 +48,7 @@ public class YhsyDutyShiftSystemDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyDutyShiftSystemHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyDutyShiftSystemHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -10,8 +10,8 @@ import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyFirstCourseRecordHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyFirstCourseRecordHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -26,7 +26,7 @@ import static com.lantone.qc.trans.comsis.ModelDocGenerate.structureMapJoin;
  * @time: 2020/3/17 13:25
  */
 @Slf4j
-public class YhsyFirstCourseRecordDocTrans extends ModelDocTrans {
+public class YuhangsyFirstCourseRecordDocTrans extends ModelDocTrans {
 
     @Override
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
@@ -40,7 +40,7 @@ public class YhsyFirstCourseRecordDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyFirstCourseRecordHtmlAnalysis();
+                YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyFirstCourseRecordHtmlAnalysis();
                 Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     sourceMap = removeSerialNumber(sourceMap);

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

@@ -15,7 +15,7 @@ import java.util.Map;
  * @author: 胡敬
  * @time: 2020/3/16 17:47
  */
-public class YhsyFirstPageRecordDocTrans extends ModelDocTrans {
+public class YuhangsyFirstPageRecordDocTrans extends ModelDocTrans {
 
     @Override
     public FirstPageRecordDoc extract(MedrecVo medrecVo) {

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

@@ -10,8 +10,8 @@ import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyInformedHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyInformedHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -24,7 +24,7 @@ import java.util.Map;
  * @time: 2021/4/18 17:48
  */
 @Slf4j
-public class YhsyInformedConsentDocTrans extends ModelDocTrans {
+public class YuhangsyInformedConsentDocTrans extends ModelDocTrans {
     @Override
     public List<InformedConsentDoc> extract(MedrecVo medrecVo) {
         List<InformedConsentDoc> retList = Lists.newArrayList();
@@ -57,7 +57,7 @@ public class YhsyInformedConsentDocTrans extends ModelDocTrans {
                 } else {
                     String recTitle = contentMap.get("recTitle").toString();
                     String recTypeId = contentMap.get("recTypeId").toString();
-                    YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyInformedHtmlAnalysis();
+                    YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyInformedHtmlAnalysis();
                     Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                     if (MapUtils.isNotEmpty(sourceMap)) {
                         structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -6,8 +6,8 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyInvasiveOperationHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyInvasiveOperationHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -20,7 +20,7 @@ import java.util.Map;
  * @time: 2021/8/27 16:12
  */
 @Slf4j
-public class YhsyInvasiveOperationDocTrans extends ModelDocTrans {
+public class YuhangsyInvasiveOperationDocTrans extends ModelDocTrans {
     @Override
     public List<InvasiveOperationDoc> extract(MedrecVo medrecVo) {
         List<InvasiveOperationDoc> retList = Lists.newArrayList();
@@ -51,7 +51,7 @@ public class YhsyInvasiveOperationDocTrans extends ModelDocTrans {
                 } else {
                     String recTitle = contentMap.get("recTitle").toString();
                     String recTypeId = contentMap.get("recTypeId").toString();
-                    YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyInvasiveOperationHtmlAnalysis();
+                    YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyInvasiveOperationHtmlAnalysis();
                     Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                     if (MapUtils.isNotEmpty(sourceMap)) {
                         structureMap.put("记录编号", contentMap.get("recId").toString());

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

@@ -9,8 +9,8 @@ import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyLeaveHospitalHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyLeaveHospitalHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -24,7 +24,7 @@ import java.util.Map;
  * @time: 2020/3/17 13:25
  */
 @Slf4j
-public class YhsyLeaveHospitalDocTrans extends ModelDocTrans {
+public class YuhangsyLeaveHospitalDocTrans extends ModelDocTrans {
 
     @Override
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
@@ -38,7 +38,7 @@ public class YhsyLeaveHospitalDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyLeaveHospitalHtmlAnalysis();
+                YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyLeaveHospitalHtmlAnalysis();
                 Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/3/19 19:41
  */
-public class YhsyLisDocTrans extends ModelDocTrans {
+public class YuhangsyLisDocTrans extends ModelDocTrans {
 
     @Override
     public List<LisDoc> extract(MedrecVo medrecVo) {

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @author: 胡敬
  * @time: 2020/6/3 15:45
  */
-public class YhsyMedicalRecordInfoDocTrans extends ModelDocTrans {
+public class YuhangsyMedicalRecordInfoDocTrans extends ModelDocTrans {
 
     @Override
     public MedicalRecordInfoDoc extract(MedrecVo medrecVo) {

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

@@ -28,7 +28,7 @@ import java.util.Set;
  * @time: 2020/3/20 17:11
  */
 @Slf4j
-public class YhsyOperationDocTrans extends ModelDocTrans {
+public class YuhangsyOperationDocTrans extends ModelDocTrans {
 
     @Override
     public List<OperationDoc> extract(MedrecVo medrecVo) {
@@ -110,7 +110,7 @@ public class YhsyOperationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyOperationHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyOperationHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
@@ -119,7 +119,7 @@ public class YhsyOperationDocTrans extends ModelDocTrans {
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
-                String text = YhsyHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
+                String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
                 operationDiscussionDoc.setText(text);
                 operationDiscussionDoc.setPageData((Map) structureMap);
                 return operationDiscussionDoc;
@@ -175,7 +175,7 @@ public class YhsyOperationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyOperationRecordHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyOperationRecordHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             //含有手术情况知情书时间特殊处理
             if (sourceMap.containsKey("时间") && sourceMap.get("时间").contains("宁波市北仑区人民医院")) {
@@ -252,7 +252,7 @@ public class YhsyOperationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyPreoperativeHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyPreoperativeHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
@@ -351,7 +351,7 @@ public class YhsyOperationDocTrans extends ModelDocTrans {
         OperationInformedConsentDoc operationInformedConsentDoc = new OperationInformedConsentDoc();
         String recTitle = contentMap.get("recTitle").toString();
         String recTypeId = contentMap.get("recTypeId").toString();
-        YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyOperationInformedHtmlAnalysis();
+        YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyOperationInformedHtmlAnalysis();
         Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
         if (MapUtils.isNotEmpty(sourceMap)) {
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -15,7 +15,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/3/19 19:41
  */
-public class YhsyOutDepDocTrans extends ModelDocTrans {
+public class YuhangsyOutDepDocTrans extends ModelDocTrans {
 
     @Override
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @author: zh
  * @time: 2021/4/7 15:41
  */
-public class YhsyPacsDocTrans extends ModelDocTrans {
+public class YuhangsyPacsDocTrans extends ModelDocTrans {
 
     @Override
     public List<PacsDoc> extract(MedrecVo medrecVo) {

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyRescueHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyRescueHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/17 17:34
  */
 @Slf4j
-public class YhsyRescueDocTrans extends ModelDocTrans {
+public class YuhangsyRescueDocTrans extends ModelDocTrans {
 
     @Override
     public List<RescueDoc> extract(MedrecVo medrecVo) {
@@ -48,7 +48,7 @@ public class YhsyRescueDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyRescueHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyRescueHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -7,8 +7,8 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyStagesSummaryHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyStagesSummaryHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -21,7 +21,7 @@ import java.util.Map;
  * @time: 2020/3/19 19:41
  */
 @Slf4j
-public class YhsyStagesSummaryDocTrans extends ModelDocTrans {
+public class YuhangsyStagesSummaryDocTrans extends ModelDocTrans {
 
     @Override
     public List<StagesSummaryDoc> extract(MedrecVo medrecVo) {
@@ -48,7 +48,7 @@ public class YhsyStagesSummaryDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyStagesSummaryHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyStagesSummaryHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -15,8 +15,8 @@ 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.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyThreeLevelWardHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyThreeLevelWardHtmlAnalysis;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
@@ -34,7 +34,7 @@ import java.util.Map;
  */
 @Slf4j
 @Setter
-public class YhsyThreeLevelWardDocTrans extends ModelDocTrans {
+public class YuhangsyThreeLevelWardDocTrans extends ModelDocTrans {
 
     private List<OperationDoc> operationDocs;
 
@@ -62,7 +62,7 @@ public class YhsyThreeLevelWardDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyThreeLevelWardHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyThreeLevelWardHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -11,9 +11,9 @@ 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.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.yuhangsy.util.YhsyHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyTransferIntoHtmlAnalysis;
-import com.lantone.qc.trans.yuhangsy.util.YhsyTransferOutHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyTransferIntoHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyTransferOutHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -25,7 +25,7 @@ import java.util.*;
  * @time: 2020/3/20 16:10
  */
 @Slf4j
-public class YhsyTransferRecordDocTrans extends ModelDocTrans {
+public class YuhangsyTransferRecordDocTrans extends ModelDocTrans {
 
     @Override
     public TransferRecordDoc extract(MedrecVo medrecVo) {
@@ -155,7 +155,7 @@ public class YhsyTransferRecordDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyTransferIntoHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyTransferIntoHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
@@ -210,7 +210,7 @@ public class YhsyTransferRecordDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyTransferOutHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyTransferOutHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
@@ -268,7 +268,7 @@ public class YhsyTransferRecordDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            YhsyHtmlAnalysis yhsyHtmlAnalysis = new YhsyTransferOutHtmlAnalysis();
+            YuhangsyHtmlAnalysis yhsyHtmlAnalysis = new YuhangsyTransferOutHtmlAnalysis();
             Map<String, String> sourceMap = yhsyHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -5,7 +5,7 @@ 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.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.yuhangsy.util.YhsyVTEGradeHtmlAnalysis;
+import com.lantone.qc.trans.yuhangsy.util.YuhangsyVTEGradeHtmlAnalysis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 
@@ -20,7 +20,7 @@ import java.util.Map;
  * @Version 1.0
  */
 @Slf4j
-public class YhsyVTEGradeDocTrans extends ModelDocTrans {
+public class YuhangsyVTEGradeDocTrans extends ModelDocTrans {
     @Override
     public VTEGradeDoc extract(MedrecVo medrecVo) {
         VTEGradeDoc vteGradeDoc = null;
@@ -33,7 +33,7 @@ public class YhsyVTEGradeDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                YhsyVTEGradeHtmlAnalysis vteGradeHtmlAnalysis = new YhsyVTEGradeHtmlAnalysis();
+                YuhangsyVTEGradeHtmlAnalysis vteGradeHtmlAnalysis = new YuhangsyVTEGradeHtmlAnalysis();
                 Map<String, String> sourceMap = vteGradeHtmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap.putAll(sourceMap);

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @Version 1.0
  */
 @Slf4j
-public class YhsyADLGradeHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyADLGradeHtmlAnalysis implements YuhangsyHtmlAnalysis {
     private String modeId = "0";//模块id待定
     @Override
     public Map<String, String> analysis(String... args) {

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

@@ -18,7 +18,7 @@ import java.util.Map;
  * @time: 2020/9/15 16:28
  */
 @Slf4j
-public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyBeHospitalizedHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "1";
 
@@ -38,7 +38,7 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
             } else {
                 analysisGeneral(doc, recTitle, map);
             }
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -48,15 +48,15 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
     //一般模板
     private void analysisGeneral(Document doc, String recTitle, Map<String, String> map) {
         //个人基础信息table解析
-        YhsyHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("table1"), map);
+        YuhangsyHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("table1"), map);
         //主诉、现病史等table解析
-        YhsyHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table6"), map);
+        YuhangsyHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table6"), map);
         if (StringUtil.isNotBlank(map.get("婚育史月经史")) && map.get("婚育史月经史").contains("经期")) {
             map.put("婚育史", map.get("婚育史月经史").substring(0, map.get("婚育史月经史").indexOf("经期")));
         }
         //体 格 检 查 表（一） table解析
         Element tgjcTableElement = doc.getElementById("table3");
-        YhsyHtmlAnalysisUtil.tableStyle2InsertMap(tgjcTableElement, map);
+        YuhangsyHtmlAnalysisUtil.tableStyle2InsertMap(tgjcTableElement, map);
 
         //诊断 table解析
         String disTableElementId = null;
@@ -70,7 +70,7 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
             }
         }
 
-        YhsyHtmlAnalysisUtil.tableStyle1InsertMap(disTableElement, map);
+        YuhangsyHtmlAnalysisUtil.tableStyle1InsertMap(disTableElement, map);
         disHandleExt(map);
 
         //医生签名、医生签名时间
@@ -89,7 +89,7 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
             map.put("医生签名", "暂无");
         }
         if (docSignTimeElement != null) {
-            map.put("医生签名时间", YhsyHtmlAnalysisUtil.elementLayer1ToStr(docSignTimeElement, false).trim());
+            map.put("医生签名时间", YuhangsyHtmlAnalysisUtil.elementLayer1ToStr(docSignTimeElement, false).trim());
         }
 
         //专科检查、辅助检查
@@ -105,7 +105,7 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
                 tgjcTableElementNt.appendTo(yuElement);
             }
         }
-        String yuText = YhsyHtmlAnalysisUtil.blockDivToStr(yuElement, true)
+        String yuText = YuhangsyHtmlAnalysisUtil.blockDivToStr(yuElement, true)
                 .replace("体  格  检  查  表 （二）", "")
                 .replace("（补充及专科情况）", "")
                 .replace("辅  助  检  查", "辅助检查：")
@@ -118,7 +118,7 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
 
     //24小时出入院记录、24小时出入院记录（全院）、24小时入出院记录(全院通用)、24小时内入院死亡记录(全院通用)
     private void analysis24h(Document doc, Map<String, String> map) {
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
         text = text.substring(text.lastIndexOf("24小时入出院记录姓    名")).replaceFirst("第1页", "");
         List<String> titles = Lists.newArrayList("姓    名", "家庭住址", "性    别", "工作单位", "年    龄", "身份证号码", "民    族",
                 "联系人(关系)", "职    业", "入院时间", "婚    姻", "死亡时间", "记录时间", "出 生 地", "病史陈述者", "主    诉", "入院情况", "心理评估",
@@ -132,9 +132,9 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
     //原-日间病历入出院记录、日间病历-性早熟
     private void analysisDay(Document doc, Map<String, String> map) {
         //个人基础信息table解析
-        YhsyHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("table1"), map);
+        YuhangsyHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("table1"), map);
         //主诉、入院情况等table解析
-        YhsyHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table6"), map);
+        YuhangsyHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table6"), map);
         //医生签名、医生签名时间
         Element docSignElement = null, docSignTimeElement = null;
         for (Element table6ElementNt : doc.getElementById("table6").parent().nextElementSiblings()) {
@@ -149,7 +149,7 @@ public class YhsyBeHospitalizedHtmlAnalysis implements YhsyHtmlAnalysis {
             map.put("医生签名", "暂无");
         }
         if (docSignTimeElement != null) {
-            map.put("医生签名时间", YhsyHtmlAnalysisUtil.elementLayer1ToStr(docSignTimeElement, false).trim());
+            map.put("医生签名时间", YuhangsyHtmlAnalysisUtil.elementLayer1ToStr(docSignTimeElement, false).trim());
         }
     }
 

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 19:41
  */
 @Slf4j
-public class YhsyClinicBloodEffectHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyClinicBloodEffectHtmlAnalysis implements YuhangsyHtmlAnalysis {
     List<String> titles = Lists.newArrayList("输血前症状", "输血前实验室指标", "输血目的", "输注成分", "输血时间",
             "开始时间", "结束时间", "输血过程");
 
@@ -44,7 +44,7 @@ public class YhsyClinicBloodEffectHtmlAnalysis implements YhsyHtmlAnalysis {
         );
 
          */
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -58,7 +58,7 @@ public class YhsyClinicBloodEffectHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 17:56
  */
 @Slf4j
-public class YhsyClinicalBloodHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyClinicalBloodHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
 
     private String modeId = "10";
@@ -45,7 +45,7 @@ public class YhsyClinicalBloodHtmlAnalysis implements YhsyHtmlAnalysis {
                         }
                     }
             );
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -59,7 +59,7 @@ public class YhsyClinicalBloodHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
  * @time: 2020/9/12 13:53
  */
 @Slf4j
-public class YhsyConsultationHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyConsultationHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "31";
 
@@ -43,7 +43,7 @@ public class YhsyConsultationHtmlAnalysis implements YhsyHtmlAnalysis {
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
                 }
             } else if ("协定方会诊".equals(recTitle)) {
-                htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
+                htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
                 if (StringUtil.isNotBlank(htmlContent)) {
                     htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
@@ -95,7 +95,7 @@ public class YhsyConsultationHtmlAnalysis implements YhsyHtmlAnalysis {
                 }
 
             } else {
-                htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
+                htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
                 //htmlContent = CommonAnalysisUtil.html2String(html);
                 if (StringUtil.isNotBlank(htmlContent)) {
                     htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
@@ -110,7 +110,7 @@ public class YhsyConsultationHtmlAnalysis implements YhsyHtmlAnalysis {
                 }
             }
             CommonAnalysisUtil.processType(structureMap, "会诊类型");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 20:12
  */
 @Slf4j
-public class YhsyConsultationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyConsultationRecordHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "7";
 
@@ -29,7 +29,7 @@ public class YhsyConsultationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyConsultationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 19:48
  */
 @Slf4j
-public class YhsyCrisisValueReportHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyCrisisValueReportHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "23";
 
@@ -29,7 +29,7 @@ public class YhsyCrisisValueReportHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyCrisisValueReportHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/14 15:28
  */
 @Slf4j
-public class YhsyCriticallyIllNoticeHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyCriticallyIllNoticeHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "25";
 
@@ -33,13 +33,13 @@ public class YhsyCriticallyIllNoticeHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replaceAll("[   ]", " ");
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
             }
             CommonAnalysisUtil.extractDateByTitle(structureMap, "告知时间");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/17 14:27
  */
 @Slf4j
-public class YhsyDeathCaseDiscussHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyDeathCaseDiscussHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "3";
 
@@ -31,16 +31,16 @@ public class YhsyDeathCaseDiscussHtmlAnalysis implements YhsyHtmlAnalysis {
             Element bigDivElement = doc.selectFirst("body").child(0);
 
             bigDivElement.child(0).lastElementSibling().remove();
-            map.put("医生签名时间", YhsyHtmlAnalysisUtil.elementLayer1ToStr(bigDivElement.child(0).lastElementSibling(), false));
+            map.put("医生签名时间", YuhangsyHtmlAnalysisUtil.elementLayer1ToStr(bigDivElement.child(0).lastElementSibling(), false));
             bigDivElement.child(0).lastElementSibling().remove();
 
-            String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, false);
+            String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, false);
             List<String> titles = Lists.newArrayList("姓名", "性别", "出生日期", "科别", "病区", "床号", "住院号",
                     "入院诊断", "死亡诊断", "尸检结果", "讨论时间", "讨论地点",
                     "主 持 人", "参加人员", "具体讨论意见", "主持人小结意见", "主持人（签名）", "记录者签名");
             CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, map);
-            YhsyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/14 15:41
  */
 @Slf4j
-public class YhsyDeathRecordHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyDeathRecordHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "24";
 
@@ -31,13 +31,13 @@ public class YhsyDeathRecordHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replaceAll("[   ]", " ");
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
             }
             CommonAnalysisUtil.extractDateByTitle(structureMap, "记录时间");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/14 15:41
  */
 @Slf4j
-public class YhsyDifficultCaseDiscussHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyDifficultCaseDiscussHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "19";
 
@@ -32,7 +32,7 @@ public class YhsyDifficultCaseDiscussHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第一页","");
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
@@ -47,7 +47,7 @@ public class YhsyDifficultCaseDiscussHtmlAnalysis implements YhsyHtmlAnalysis {
 
                 }
             }
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 20:00
  */
 @Slf4j
-public class YhsyDutyShiftSystemHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyDutyShiftSystemHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "9";
 
@@ -29,7 +29,7 @@ public class YhsyDutyShiftSystemHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyDutyShiftSystemHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/9 11:24
  */
 @Slf4j
-public class YhsyFirstCourseRecordHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyFirstCourseRecordHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "2";
 
@@ -31,7 +31,7 @@ public class YhsyFirstCourseRecordHtmlAnalysis implements YhsyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replace("—/—", "")
                         .replace("第1页", "")
@@ -70,7 +70,7 @@ public class YhsyFirstCourseRecordHtmlAnalysis implements YhsyHtmlAnalysis {
                     structureMap.put("（一）病历特点", structureMap.get("（一）病历特点").split("入院查体")[0]);
                 }
             }
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, args[2], structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, args[2], structureMap);
             //        CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
             //        structureMap.forEach((k,v)-> System.out.println(k + "------" + v));
             //        structureMap.put("rec_title=", "107");

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

@@ -7,7 +7,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/9/9 11:26
  */
-public interface YhsyHtmlAnalysis {
+public interface YuhangsyHtmlAnalysis {
 
     Map<String,String> analysis(String...args);
 

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @author: rengb
  * @time: 2020/9/15 16:31
  */
-public class YhsyHtmlAnalysisUtil {
+public class YuhangsyHtmlAnalysisUtil {
 
     /**
      * table样式：key和value在同一个td中，以冒号分开；保留换行

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

@@ -19,7 +19,7 @@ import java.util.Map;
  * @time: 2020/9/14 15:41
  */
 @Slf4j
-public class YhsyInformedHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyInformedHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "53";
 
@@ -44,7 +44,7 @@ public class YhsyInformedHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
             if (StringUtil.isNotBlank(recTitle) && recTitle.contains("知情选择授权书")) {
                 structureMap.put("标题", recTitle);
                 return structureMap;
@@ -71,7 +71,7 @@ public class YhsyInformedHtmlAnalysis implements YhsyHtmlAnalysis {
 
             resultHandle(structureMap);
             disDate(structureMap, "医师签名", "签名时间");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
  * @time: 2021/8/27 16:43
  */
 @Slf4j
-public class YhsyInvasiveOperationHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyInvasiveOperationHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "59";
 
@@ -42,7 +42,7 @@ public class YhsyInvasiveOperationHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
             if (MapUtils.isNotEmpty(structureMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(structureMap, keyContrasts);
@@ -52,7 +52,7 @@ public class YhsyInvasiveOperationHtmlAnalysis implements YhsyHtmlAnalysis {
                 structureMap.put("术后注意",cases);
             }
             structureMap = preSolve(htmlContent, structureMap);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/9 11:24
  */
 @Slf4j
-public class YhsyLeaveHospitalHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyLeaveHospitalHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "5";
 
@@ -33,7 +33,7 @@ public class YhsyLeaveHospitalHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replace("下拉选择无或右键调用临床数据", "");
                 htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
@@ -49,7 +49,7 @@ public class YhsyLeaveHospitalHtmlAnalysis implements YhsyHtmlAnalysis {
                 structureMap.put("入院情况", discharge.substring(index + 4));
             }
             CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 14:56
  */
 @Slf4j
-public class YhsyOperationHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyOperationHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "18";
 
@@ -30,7 +30,7 @@ public class YhsyOperationHtmlAnalysis implements YhsyHtmlAnalysis {
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
             CommonAnalysisUtil.makeEmpty(map, "医生签名");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -44,7 +44,7 @@ public class YhsyOperationHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle, text, map);
         String bqjlText = "病情记录" + map.get("病情记录")
                 .replace("提醒：有创诊疗操作记录内容包括操作名称、时间、步骤、结果及患者的一般情况，记录操作过","")

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

@@ -20,7 +20,7 @@ import java.util.Map;
  * @time: 2020/9/14 15:41
  */
 @Slf4j
-public class YhsyOperationInformedHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyOperationInformedHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "16";
 
@@ -38,7 +38,7 @@ public class YhsyOperationInformedHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = YhsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
+            String htmlContent = YuhangsyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replaceAll("[   ]", " ");
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
@@ -52,7 +52,7 @@ public class YhsyOperationInformedHtmlAnalysis implements YhsyHtmlAnalysis {
 
             resultHandle(structureMap);
             parseMethod(structureMap);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/28 16:36
  */
 @Slf4j
-public class YhsyOperationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyOperationRecordHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "17";
 
@@ -30,7 +30,7 @@ public class YhsyOperationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(bigDivElement, map);
-            YhsyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
+            YuhangsyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
             String operatingCrew = null;
             if (map.containsKey("手术人员")) {
                 operatingCrew = map.get("手术人员");
@@ -61,7 +61,7 @@ public class YhsyOperationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
                 }
             }
             CommonAnalysisUtil.makeEmpty(map, "医生签名");
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -72,7 +72,7 @@ public class YhsyOperationRecordHtmlAnalysis implements YhsyHtmlAnalysis {
         /*if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }*/
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         text = text.replaceAll("第1页", "");
         List<String> titles = Lists.newArrayList(
                 "姓名", "性别", "出生日期", "出生年月", "科别", "科室", "病区", "床号", "床位", "住院号",

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @time: 2020/9/17 19:19
  */
 @Slf4j
-public class YhsyPreoperativeHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyPreoperativeHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "11";
 
@@ -31,8 +31,8 @@ public class YhsyPreoperativeHtmlAnalysis implements YhsyHtmlAnalysis {
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(bigDivElement, map);
 
-            YhsyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyPreoperativeHtmlAnalysis implements YhsyHtmlAnalysis {
         /*if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }*/
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
 
         int index1 = text.lastIndexOf("经治医生签名");
         int index2 = text.lastIndexOf("主刀医生签名");

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 20:12
  */
 @Slf4j
-public class YhsyRescueHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyRescueHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "22";
 
@@ -29,7 +29,7 @@ public class YhsyRescueHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyRescueHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 20:16
  */
 @Slf4j
-public class YhsyStagesSummaryHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyStagesSummaryHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "28";
 
@@ -29,7 +29,7 @@ public class YhsyStagesSummaryHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyStagesSummaryHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle, text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -19,7 +19,7 @@ import java.util.Map;
  * @time: 2020/9/15 10:28
  */
 @Slf4j
-public class YhsyThreeLevelWardHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyThreeLevelWardHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "4";
 
@@ -38,11 +38,11 @@ public class YhsyThreeLevelWardHtmlAnalysis implements YhsyHtmlAnalysis {
             if (bigDivElement.selectFirst("hr") != null) {
                 bigDivElement.selectFirst("hr").previousElementSiblings().remove();
             }
-            String htmlText = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+            String htmlText = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
             htmlText = htmlText.replace("注意：上级医师查房主要记 录：患者病情、诊断、鉴别诊断、当前治疗措施和疗效的分析及下一步诊疗意见等，能反应上级医 师的水平。", "")
                     .replace("提醒：有创诊疗操作记录内容包括操作名称、时间、步骤、结果及患者的一般情况，记录操作过 程是否顺利，有无不良反应，术后注意事项，操作医师签名、记录时间等。 手术室完成的、治疗性质的及全麻下完成的有创诊疗操作参照手术管理。（包括介入治疗、胃肠镜 下肿瘤切除/粘膜下肿瘤剥除等）", "");
             CommonAnalysisUtil.extractWardInfo(recTitle, htmlText, structureMap);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 20:20
  */
 @Slf4j
-public class YhsyTransferIntoHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyTransferIntoHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "26";
 
@@ -29,7 +29,7 @@ public class YhsyTransferIntoHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyTransferIntoHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle, text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @time: 2020/9/28 20:22
  */
 @Slf4j
-public class YhsyTransferOutHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyTransferOutHtmlAnalysis implements YuhangsyHtmlAnalysis {
 
     private String modeId = "27";
 
@@ -29,7 +29,7 @@ public class YhsyTransferOutHtmlAnalysis implements YhsyHtmlAnalysis {
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
-            YhsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
+            YuhangsyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -43,7 +43,7 @@ public class YhsyTransferOutHtmlAnalysis implements YhsyHtmlAnalysis {
         if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
-        String text = YhsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = YuhangsyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         CommonAnalysisUtil.extractWardInfo(recTitle, text, map);
         String bqjlText = "病情记录" + map.get("病情记录").replace("年   月   日   时   分 ","");
         List<String> titles = Lists.newArrayList(

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @Version 1.0
  */
 @Slf4j
-public class YhsyVTEGradeHtmlAnalysis implements YhsyHtmlAnalysis {
+public class YuhangsyVTEGradeHtmlAnalysis implements YuhangsyHtmlAnalysis {
     private String modeId = "0";//模块id待定
     @Override
     public Map<String, String> analysis(String... args) {