zhoutg 5 年 前
コミット
dabe706159

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstCourseRecordDocTrans.java

@@ -24,6 +24,7 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         FirstCourseRecordDoc firstCourseRecordDoc = new FirstCourseRecordDoc();
+        firstCourseRecordDoc.setText(content);
         firstCourseRecordDoc.setStructureMap(structureMap);
         firstCourseRecordDoc.setPageData((Map)sourceMap);
         return firstCourseRecordDoc;

+ 4 - 3
trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouLeaveHospitalDocTrans.java

@@ -3,7 +3,6 @@ package com.lantone.qc.trans.taizhou;
 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.pub.util.MapUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
@@ -22,10 +21,12 @@ public class TaiZhouLeaveHospitalDocTrans extends ModelDocTrans {
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
         leaveHospitalDoc.setStructureMap(structureMap);
-        MapUtil.console(structureMap);
+        leaveHospitalDoc.setText(content);
+        leaveHospitalDoc.setPageData((Map)sourceMap);
         return leaveHospitalDoc;
     }