对接修改

public/pom.xml

@@ -38,6 +38,11 @@
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
         </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>

public/src/main/java/com/lantone/qc/pub/util/StringUtil.java

@@ -172,6 +172,17 @@ public class StringUtil {
         return content;
     }
 
+    /**
+     * 判断两个字符串是否相同
+     *
+     * @param arg1
+     * @param arg2
+     * @return
+     */
+    public static boolean equals(String arg1, String arg2) {
+        return StringUtils.equals(arg1, arg2);
+    }
+
     /**
      * 比较两个字符串集合是否内容一样，即A包含B，B包含A，交集为空
      * 个数、顺序不考虑

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.AnesthesiaRelatedDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouAnesthesiaRelatedDocTrans extends ModelDocTrans {
     }
 
     private AnesthesiaRelatedDoc getAnesthesiaRelatedDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         AnesthesiaRelatedDoc anesthesiaRelatedDoc = new AnesthesiaRelatedDoc();
         anesthesiaRelatedDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
         BeHospitalizedDoc beHospitalizedDoc = new BeHospitalizedDoc();
         beHospitalizedDoc.setStructureMap(structureMap);
 

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouClinicalBloodDocTrans extends ModelDocTrans {
     }
 
     private ClinicalBloodDoc getClinicalBloodDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         ClinicalBloodDoc clinicalBloodDoc = new ClinicalBloodDoc();
         clinicalBloodDoc.setStructureMap(structureMap);

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

@@ -11,6 +11,7 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -77,7 +78,7 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationRecordDoc getConsultationRecordDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, consultationRecord_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), consultationRecord_keyContrasts);
 
         ConsultationRecordDoc consultationRecordDoc = new ConsultationRecordDoc();
         consultationRecordDoc.setStructureMap(structureMap);
@@ -141,7 +142,7 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationResultsDoc getConsultationResultsDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, consultationResults_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), consultationResults_keyContrasts);
 
         ConsultationResultsDoc consultationResultsDoc = new ConsultationResultsDoc();
         consultationResultsDoc.setStructureMap(structureMap);
@@ -207,7 +208,7 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, consultationApplication_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), consultationApplication_keyContrasts);
 
         ConsultationApplicationDoc consultationApplicationDoc = new ConsultationApplicationDoc();
         consultationApplicationDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.CrisisValueReportDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouCrisisValueReportDocTrans extends ModelDocTrans {
     }
 
     private CrisisValueReportDoc getCrisisValueReportDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         CrisisValueReportDoc crisisValueReportDoc = new CrisisValueReportDoc();
         crisisValueReportDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.CriticallyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouCriticallyIllNoticeDocTrans extends ModelDocTrans {
     }
 
     private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         CriticallyIllNoticeDoc criticallyIllNoticeDoc = new CriticallyIllNoticeDoc();
         criticallyIllNoticeDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouDeathCaseDiscussDocTrans extends ModelDocTrans {
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = new DeathCaseDiscussDoc();
         deathCaseDiscussDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouDeathRecordDocTrans extends ModelDocTrans {
     public DeathRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DeathRecordDoc deathRecordDoc = new DeathRecordDoc();
         deathRecordDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DifficultCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouDifficultCaseDiscussDocTrans extends ModelDocTrans {
     }
 
     private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = new DifficultCaseDiscussDoc();
         difficultCaseDiscussDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouDoctorAdviceDocTrans extends ModelDocTrans {
     }
 
     private DoctorAdviceDoc getDoctorAdviceDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DoctorAdviceDoc doctorAdviceDoc = new DoctorAdviceDoc();
         doctorAdviceDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DutyShiftSystemDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouDutyShiftSystemDocTrans extends ModelDocTrans {
     }
 
     private DutyShiftSystemDoc getDutyShiftSystemDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DutyShiftSystemDoc dutyShiftSystemDoc = new DutyShiftSystemDoc();
         dutyShiftSystemDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         FirstCourseRecordDoc firstCourseRecordDoc = new FirstCourseRecordDoc();
         firstCourseRecordDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
     public FirstPageRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
         firstPageRecordDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.InvasiveOperationDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouInvasiveOperationDocTrans extends ModelDocTrans {
     }
 
     private InvasiveOperationDoc getInvasiveOperationDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         InvasiveOperationDoc invasiveOperationDoc = new InvasiveOperationDoc();
         invasiveOperationDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouLeaveHospitalDocTrans extends ModelDocTrans {
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
         leaveHospitalDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.MedicalWritingDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouMedicalWritingDocTrans extends ModelDocTrans {
     }
 
     private MedicalWritingDoc getMedicalWritingDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         MedicalWritingDoc medicalWritingDoc = new MedicalWritingDoc();
         medicalWritingDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.NursingSystemDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public class TaiZhouNursingSystemDocTrans extends ModelDocTrans {
     public NursingSystemDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         NursingSystemDoc nursingSystemDoc = new NursingSystemDoc();
         nursingSystemDoc.setStructureMap(structureMap);

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

@@ -11,6 +11,7 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -77,7 +78,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationDiscussionDoc getOperationDiscussionDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, operationDiscussion_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), operationDiscussion_keyContrasts);
 
         OperationDiscussionDoc operationDiscussionDoc = new OperationDiscussionDoc();
         operationDiscussionDoc.setStructureMap(structureMap);
@@ -110,7 +111,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationRecordDoc getOperationRecordDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, operationRecord_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), operationRecord_keyContrasts);
 
         OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
         operationRecordDoc.setStructureMap(structureMap);
@@ -143,7 +144,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, preoperativeDiscussion_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), preoperativeDiscussion_keyContrasts);
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = new PreoperativeDiscussionDoc();
         preoperativeDiscussionDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.ReasonableDiagnosisDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouReasonableDiagnosisDocTrans extends ModelDocTrans {
     }
 
     private ReasonableDiagnosisDoc getReasonableDiagnosisDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         ReasonableDiagnosisDoc reasonableDiagnosisDoc = new ReasonableDiagnosisDoc();
         reasonableDiagnosisDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.RescueDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouRescueDocTrans extends ModelDocTrans {
     }
 
     private RescueDoc getRescueDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         RescueDoc rescueDoc = new RescueDoc();
         rescueDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.SeriouslyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouSeriouslyIllNoticeDocTrans extends ModelDocTrans {
     }
 
     private SeriouslyIllNoticeDoc getSeriouslyIllNoticeDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         SeriouslyIllNoticeDoc seriouslyIllNoticeDoc = new SeriouslyIllNoticeDoc();
         seriouslyIllNoticeDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.StagesSummaryDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouStagesSummaryDocTrans extends ModelDocTrans {
     }
 
     private StagesSummaryDoc getStagesSummaryDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         StagesSummaryDoc stagesSummaryDoc = new StagesSummaryDoc();
         stagesSummaryDoc.setStructureMap(structureMap);

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
     }
 
     private ThreeLevelWardDoc getThreeLevelWardDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         ThreeLevelWardDoc threeLevelWardDoc = new ThreeLevelWardDoc();
         threeLevelWardDoc.setStructureMap(structureMap);

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

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 
 import java.util.List;
@@ -73,7 +74,7 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private TransferIntoDoc getTransferIntoDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, transferInto_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), transferInto_keyContrasts);
 
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setStructureMap(structureMap);
@@ -106,7 +107,7 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private TransferOutDoc getTransferOutDoc(String content) {
-        Map<String, String> structureMap = TzXmlUtil.analysisXmlToMap(content, transferOut_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), transferOut_keyContrasts);
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setStructureMap(structureMap);

trans/src/main/java/com/lantone/qc/trans/taizhou/util/TzXmlUtil.java

@@ -1,7 +1,6 @@
 package com.lantone.qc.trans.taizhou.util;
 
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.FileUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
@@ -34,30 +33,4 @@ public class TzXmlUtil {
         return retMap;
     }
 
-    public static Map<String, String> analysisXmlToMap(String xml, List<String> keyContrasts) {
-        Map<String, String> retMap = Maps.newHashMap();
-        Map<String, String> sourceMap = getXmlToMapForTZ(xml);
-        String[] arry = null;
-        String sourceKey = null, targetKey;
-        for (String keyContrast : keyContrasts) {
-            arry = keyContrast.split("=");
-            sourceKey = arry[0];
-            if (arry.length == 1) {
-                targetKey = arry[0];
-            } else {
-                targetKey = arry[1];
-            }
-            retMap.put(targetKey, sourceMap.get(sourceKey));
-        }
-        return retMap;
-    }
-
-    public static void main(String[] args) {
-        String msg = FileUtil.fileRead("C:\\Users\\RGB\\Desktop\\调试\\台州出院小结.xml");
-        Map<String, String> map = getXmlToMapForTZ(msg);
-        map.keySet().forEach(key -> {
-            System.out.println("\"" + key + "=\",");
-        });
-    }
-
 }