长兴模板更新

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -22,7 +22,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
     @Override
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
-        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
         String tgjc = sourceMap.get("一般情况") + "。"
                 + sourceMap.get("皮肤情况") + "。"
                 + sourceMap.get("淋巴") + "。"
@@ -44,7 +44,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
         }
         BeHospitalizedDoc beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);
         beHospitalizedDoc.setText(content);
-        beHospitalizedDoc.setPageData((Map) sourceMap);
+        beHospitalizedDoc.setPageData((Map) structureMap);
         return beHospitalizedDoc;
     }
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicBloodEffectDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxClinicBloodEffectDocTrans extends ModelDocTrans {
         return retList;
     }
     private ClinicBloodEffectDoc getClinicalBloodDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent/Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -44,7 +44,7 @@ public class ChangxClinicBloodEffectDocTrans extends ModelDocTrans {
 
         ClinicBloodEffectDoc clinicBloodEffectDoc = ModelDocGenerate.clinicBloodEffectDoc(cutWordMap);
         clinicBloodEffectDoc.setText(text);
-        clinicBloodEffectDoc.setPageData((Map) xmlNodeValueMap);
+        clinicBloodEffectDoc.setPageData((Map) cutWordMap);
 
         return clinicBloodEffectDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicalBloodDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
     }
 
     private ClinicalBloodDoc getClinicalBloodDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent/Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -44,7 +44,7 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
 
         ClinicalBloodDoc clinicalBloodDoc = ModelDocGenerate.clinicalBloodDocGen(cutWordMap);
         clinicalBloodDoc.setText(text);
-        clinicalBloodDoc.setPageData((Map) xmlNodeValueMap);
+        clinicalBloodDoc.setPageData((Map) cutWordMap);
 
         return clinicalBloodDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java

@@ -81,19 +81,20 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationRecordDoc getConsultationRecordDoc(String content) {
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationRecord_keyContrasts);
+
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
         if (StringUtil.isBlank(text)) {
             text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region");
         }
         Map<String, String> cutWordMap = Preproc.getCutWordMap(true, consultationRecord_sourceTitles, text);
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
-        cutWordMap.putAll(xmlNodeValueMap);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(cutWordMap, consultationRecord_keyContrasts);
-        MapUtil.keyAssig(structureMap, "记录医师", "签名");
+        cutWordMap.putAll(structureMap);
+        MapUtil.keyAssig(cutWordMap, "记录医师", "签名");
 
-        ConsultationRecordDoc consultationRecordDoc = ModelDocGenerate.consultationRecordDocGen(structureMap);
+        ConsultationRecordDoc consultationRecordDoc = ModelDocGenerate.consultationRecordDocGen(cutWordMap);
         consultationRecordDoc.setText(text);
-        consultationRecordDoc.setPageData((Map) xmlNodeValueMap);
+        consultationRecordDoc.setPageData((Map) cutWordMap);
 
         return consultationRecordDoc;
     }
@@ -132,7 +133,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationResultsDoc getConsultationResultsDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -144,7 +145,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
         ConsultationResultsDoc consultationResultsDoc = ModelDocGenerate.consultationResultsDocGen(cutWordMap);
         consultationResultsDoc.setText(content);
-        consultationResultsDoc.setPageData((Map) xmlNodeValueMap);
+        consultationResultsDoc.setPageData((Map) cutWordMap);
         return consultationResultsDoc;
     }
 
@@ -185,7 +186,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
     }
 
     private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -197,7 +198,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
         ConsultationApplicationDoc consultationApplicationDoc = ModelDocGenerate.consultationApplicationDocGen(cutWordMap);
         consultationApplicationDoc.setText(text);
-        consultationApplicationDoc.setPageData((Map) xmlNodeValueMap);
+        consultationApplicationDoc.setPageData((Map) cutWordMap);
 
         return consultationApplicationDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxCrisisValueReportDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxCrisisValueReportDocTrans extends ModelDocTrans {
     }
 
     private CrisisValueReportDoc getCrisisValueReportDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         structureMap.put("医生姓名", structureMap.get("医生签名"));
 
@@ -44,7 +44,7 @@ public class ChangxCrisisValueReportDocTrans extends ModelDocTrans {
 
         CrisisValueReportDoc crisisValueReportDoc = ModelDocGenerate.crisisValueReportDocGen(cutWordMap);
         crisisValueReportDoc.setText(text);
-        crisisValueReportDoc.setPageData((Map) xmlNodeValueMap);
+        crisisValueReportDoc.setPageData((Map) cutWordMap);
 
         return crisisValueReportDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxCriticallyIllNoticeDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxCriticallyIllNoticeDocTrans extends ModelDocTrans {
     }
 
     private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -43,7 +43,7 @@ public class ChangxCriticallyIllNoticeDocTrans extends ModelDocTrans {
 
         CriticallyIllNoticeDoc criticallyIllNoticeDoc = ModelDocGenerate.criticallyIllNoticeDocGen(cutWordMap);
         criticallyIllNoticeDoc.setText(text);
-        criticallyIllNoticeDoc.setPageData((Map) xmlNodeValueMap);
+        criticallyIllNoticeDoc.setPageData((Map) cutWordMap);
 
         return criticallyIllNoticeDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathCaseDiscussDocTrans.java

@@ -23,7 +23,7 @@ public class ChangxDeathCaseDiscussDocTrans extends ModelDocTrans {
     @Override
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -35,7 +35,7 @@ public class ChangxDeathCaseDiscussDocTrans extends ModelDocTrans {
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = ModelDocGenerate.deathCaseDiscussDocGen(cutWordMap);
         deathCaseDiscussDoc.setText(text);
-        deathCaseDiscussDoc.setPageData((Map) xmlNodeValueMap);
+        deathCaseDiscussDoc.setPageData((Map) cutWordMap);
 
         return deathCaseDiscussDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathRecordDocTrans.java

@@ -24,7 +24,7 @@ public class ChangxDeathRecordDocTrans extends ModelDocTrans {
     public DeathRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -36,7 +36,7 @@ public class ChangxDeathRecordDocTrans extends ModelDocTrans {
 
         DeathRecordDoc deathRecordDoc = ModelDocGenerate.deathRecordDocGen(cutWordMap);
         deathRecordDoc.setText(text);
-        deathRecordDoc.setPageData((Map) xmlNodeValueMap);
+        deathRecordDoc.setPageData((Map) cutWordMap);
 
         return deathRecordDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDifficultCaseDiscussDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
     }
 
     private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -43,7 +43,7 @@ public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = ModelDocGenerate.difficultCaseDiscussDocGen(cutWordMap);
         difficultCaseDiscussDoc.setText(content);
-        difficultCaseDiscussDoc.setPageData((Map) xmlNodeValueMap);
+        difficultCaseDiscussDoc.setPageData((Map) cutWordMap);
 
         return difficultCaseDiscussDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstCourseRecordDocTrans.java

@@ -25,18 +25,19 @@ public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
     @Override
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
+
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
         if (StringUtil.isBlank(text)) {
             text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region");
         }
         Map<String, String> cutWordMap = getCutWordMap(text);
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
-        cutWordMap.putAll(xmlNodeValueMap);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(cutWordMap, keyContrasts);
-        FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
+        cutWordMap.putAll(structureMap);
+
+        FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(cutWordMap);
         firstCourseRecordDoc.setText(text);
-        xmlNodeValueMap.put("mode_id", ModuleMappingUtil.getXmlDataTypeModuleId(xmlNodeValueMap));
-        firstCourseRecordDoc.setPageData((Map) xmlNodeValueMap);
+        firstCourseRecordDoc.setPageData((Map) cutWordMap);
         return firstCourseRecordDoc;
     }
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxLeaveHospitalDocTrans.java

@@ -21,11 +21,11 @@ public class ChangxLeaveHospitalDocTrans extends ModelDocTrans {
     @Override
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
-        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);
         leaveHospitalDoc.setText(content);
-        leaveHospitalDoc.setPageData((Map) sourceMap);
+        leaveHospitalDoc.setPageData((Map) structureMap);
         return leaveHospitalDoc;
     }
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -88,7 +88,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationDiscussionDoc getOperationDiscussionDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent/Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationDiscussion_keyContrasts);
         if (StringUtil.isNotBlank(structureMap.get("手术开始时间"))) {
             structureMap.put("手术时间", structureMap.get("手术开始时间"));
@@ -106,7 +106,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
         OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(cutWordMap);
         operationDiscussionDoc.setText(text);
-        operationDiscussionDoc.setPageData((Map) xmlNodeValueMap);
+        operationDiscussionDoc.setPageData((Map) cutWordMap);
 
         return operationDiscussionDoc;
     }
@@ -170,7 +170,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationRecordDoc getOperationRecordDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationRecord_keyContrasts);
         if (StringUtil.isNotBlank(structureMap.get("签名"))) {
             structureMap.put("记录医师", structureMap.get("签名"));
@@ -185,7 +185,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
         OperationRecordDoc operationRecordDoc = ModelDocGenerate.operationRecordDocGen(cutWordMap);
         operationRecordDoc.setText(text);
-        operationRecordDoc.setPageData((Map) xmlNodeValueMap);
+        operationRecordDoc.setPageData((Map) cutWordMap);
 
         return operationRecordDoc;
     }
@@ -259,7 +259,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
     }
 
     private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, preoperativeDiscussion_keyContrasts);
         structureMap.put(
                 "术前准备内容",
@@ -275,7 +275,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         }
         if (StringUtil.isNotBlank(structureMap.get("拟行治疗指征及禁忌症"))) {
             structureMap.put("拟行术式", structureMap.get("拟行治疗指征及禁忌症"));
-        } else if (StringUtil.isNotBlank(structureMap.get("拟施手术方式"))){
+        } else if (StringUtil.isNotBlank(structureMap.get("拟施手术方式"))) {
             structureMap.put("拟行术式", structureMap.get("拟施手术方式"));
         }
 
@@ -289,7 +289,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(cutWordMap);
         preoperativeDiscussionDoc.setText(text);
-        preoperativeDiscussionDoc.setPageData((Map) xmlNodeValueMap);
+        preoperativeDiscussionDoc.setPageData((Map) cutWordMap);
 
         return preoperativeDiscussionDoc;
     }
@@ -353,7 +353,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationInformedConsentDoc getOperationInformedConsentDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationInformedConsent_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -365,7 +365,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
         OperationInformedConsentDoc operationInformedConsentDoc = ModelDocGenerate.operationInformedConsentDocGen(cutWordMap);
         operationInformedConsentDoc.setText(text);
-        operationInformedConsentDoc.setPageData((Map) xmlNodeValueMap);
+        operationInformedConsentDoc.setPageData((Map) cutWordMap);
 
         return operationInformedConsentDoc;
     }
@@ -427,8 +427,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
     }
 
     private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap,    operationSafetyChecklist_keyContrasts);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationSafetyChecklist_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
         if (StringUtil.isBlank(text)) {
@@ -439,7 +439,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
         OperationSafetyChecklistDoc operationSafetyChecklistDoc = ModelDocGenerate.operationSafetyChecklistDocGen(cutWordMap);
         operationSafetyChecklistDoc.setText(text);
-        operationSafetyChecklistDoc.setPageData((Map) xmlNodeValueMap);
+        operationSafetyChecklistDoc.setPageData((Map) cutWordMap);
 
         return operationSafetyChecklistDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxPathologyShipDocTrans.java

@@ -28,7 +28,7 @@ public class ChangxPathologyShipDocTrans extends ModelDocTrans {
     }
 
     private PathologyShipDoc getPathologyShipDoc(String content) {
-        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         PathologyShipDoc pathologyShipDoc = new PathologyShipDoc();

trans/src/main/java/com/lantone/qc/trans/changx/ChangxRescueDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxRescueDocTrans extends ModelDocTrans {
     }
 
     private RescueDoc getRescueDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -43,7 +43,7 @@ public class ChangxRescueDocTrans extends ModelDocTrans {
 
         RescueDoc rescueDoc = ModelDocGenerate.rescueDocGen(cutWordMap);
         rescueDoc.setText(text);
-        rescueDoc.setPageData((Map) xmlNodeValueMap);
+        rescueDoc.setPageData((Map) cutWordMap);
 
         return rescueDoc;
     }
@@ -59,7 +59,7 @@ public class ChangxRescueDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "记录日期=记录时间",
             "病情变化情况=",
-            "抢救时间及措施++++抢救措施=抢救过程",
+            "抢救时间及措施++++抢救措施=",
             "参加抢救者的姓名及专业技术职称++++参加现场抢救的医师及护理人员=参与人员",
             "签名++++=记录医师",
             "签名时间=抢救时间"

trans/src/main/java/com/lantone/qc/trans/changx/ChangxStagesSummaryDocTrans.java

@@ -31,7 +31,7 @@ public class ChangxStagesSummaryDocTrans extends ModelDocTrans {
     }
 
     private StagesSummaryDoc getStagesSummaryDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -43,7 +43,7 @@ public class ChangxStagesSummaryDocTrans extends ModelDocTrans {
 
         StagesSummaryDoc stagesSummaryDoc = ModelDocGenerate.stagesSummaryDocGen(cutWordMap);
         stagesSummaryDoc.setText(text);
-        stagesSummaryDoc.setPageData((Map) xmlNodeValueMap);
+        stagesSummaryDoc.setPageData((Map) cutWordMap);
 
         return stagesSummaryDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

@@ -39,7 +39,7 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
     }
 
     private void classifyThreeLevelWardDoc(ThreeLevelWardDoc threeLevelWardDoc, String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         structureMap.put("查房日期", structureMap.get("记录时间"));
 
@@ -51,7 +51,7 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
             }
             cutWordMap = Preproc.getCutWordMap(true, sourceTitles, text);
             if (StringUtil.isBlank(structureMap.get("记录医师"))) {
-                if(StringUtil.isNotEmpty(cutWordMap.get("医师签名"))){
+                if (StringUtil.isNotEmpty(cutWordMap.get("医师签名"))) {
                     Pattern p = Pattern.compile("^[^\\u4e00-\\u9fa5]+$");//分词结果如果不包含中文为日期，则不覆盖
                     Matcher m = p.matcher(cutWordMap.get("医师签名"));
                     if (!m.matches()) {
@@ -68,12 +68,12 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
         threeLevelWardDoc.addAllDoctorWradDoc(allDoctorWradDoc);
 
         //主任医师查房
-        DirectorDoctorWardDoc directorDoctorWardDoc = findDirectorDoctorWardDoc(xmlNodeValueMap, structureMap);
+        DirectorDoctorWardDoc directorDoctorWardDoc = findDirectorDoctorWardDoc(structureMap);
         if (directorDoctorWardDoc != null) {
-            threeLevelWardDoc.addDirectorDoctorWardDoc(findDirectorDoctorWardDoc(xmlNodeValueMap, structureMap));
+            threeLevelWardDoc.addDirectorDoctorWardDoc(findDirectorDoctorWardDoc(structureMap));
         }
         //主治医师查房
-        AttendingDoctorWardDoc attendingDoctorWardDoc = findAttendingDoctorWardDoc(xmlNodeValueMap, structureMap);
+        AttendingDoctorWardDoc attendingDoctorWardDoc = findAttendingDoctorWardDoc(structureMap);
         if (attendingDoctorWardDoc != null) {
             threeLevelWardDoc.addAttendingDoctorWardDoc(attendingDoctorWardDoc);
         }
@@ -89,10 +89,9 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
     /**
      * 主任医师查房
      *
-     * @param sourceMap
      * @param structureMap
      */
-    private DirectorDoctorWardDoc findDirectorDoctorWardDoc(Map<String, String> sourceMap, Map<String, String> structureMap) {
+    private DirectorDoctorWardDoc findDirectorDoctorWardDoc(Map<String, String> structureMap) {
         String title = structureMap.get("查房标题");
         title = subTitle(title);    //标题有代字
 
@@ -108,10 +107,9 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
     /**
      * 主治医师查房
      *
-     * @param sourceMap
      * @param structureMap
      */
-    private AttendingDoctorWardDoc findAttendingDoctorWardDoc(Map<String, String> sourceMap, Map<String, String> structureMap) {
+    private AttendingDoctorWardDoc findAttendingDoctorWardDoc(Map<String, String> structureMap) {
         String title = structureMap.get("查房标题");
         title = subTitle(title);    //标题有代字
         AttendingDoctorWardDoc attendingDoctorWardDoc = null;

trans/src/main/java/com/lantone/qc/trans/changx/ChangxTransferRecordDocTrans.java

@@ -10,9 +10,7 @@ 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.changx.util.CxXmlUtil;
-import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.comsis.Preproc;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -136,14 +134,14 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private TransferIntoDoc getTransferIntoDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
-//        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
+        //        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setText(content);
         transferIntoDoc.setStructureMap(structureMap);
-        transferIntoDoc.setPageData((Map)xmlNodeValueMap);
+        transferIntoDoc.setPageData((Map) structureMap);
 
         return transferIntoDoc;
     }
@@ -170,12 +168,12 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private TransferRecordDoc getTransferAllDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
         transferAllDoc.setText(content);
         transferAllDoc.setStructureMap(structureMap);
-        transferAllDoc.setPageData((Map) xmlNodeValueMap);
+        transferAllDoc.setPageData((Map) structureMap);
         return transferAllDoc;
     }
 
@@ -202,13 +200,13 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private TransferOutDoc getTransferOutDoc(String content) {
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent//Region", content);
+        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setText(content);
         transferOutDoc.setStructureMap(structureMap);
-        transferOutDoc.setPageData((Map) xmlNodeValueMap);
+        transferOutDoc.setPageData((Map) structureMap);
 
         return transferOutDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/util/CxXmlUtil.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public class CxXmlUtil {
 
-    public static Map<String, String> firstLevelNodeValue(String nodePath, String content) {
+    public static Map<String, String> firstLevelNodeValue(String content) {
         Map<String, String> retMap = Maps.newLinkedHashMap();
         try {
             String helpTip, controlName, contentText, key;
@@ -100,7 +100,7 @@ public class CxXmlUtil {
     public static void main(String[] args) {
         try {
             String context = FileUtil.fileRead("C:\\Users\\dell\\Desktop\\调试\\test1.txt");
-            Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent/Region", context);
+            Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(context);
             for (String key : sourceMap.keySet()) {
                 System.out.println("\"" + key + "=\",");
             }