wangyu пре 5 година
родитељ
комит
7252fee8e7

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

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -24,7 +25,8 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
         // 与长兴一直,直接传json
         // 与长兴一直,直接传json
         Map<String, String> content = (Map) medrecVo.getContent();
         Map<String, String> content = (Map) medrecVo.getContent();
         FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
         FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
-        firstPageRecordDoc.setStructureMap(content);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(content, keyContrasts);
+        firstPageRecordDoc.setStructureMap(structureMap);
 
 
         Map<String, Object> structureExtMap = Maps.newHashMap();
         Map<String, Object> structureExtMap = Maps.newHashMap();
         structureExtMap.putAll(content);
         structureExtMap.putAll(content);
@@ -37,10 +39,8 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
         firstPageRecordDoc.setPageData(medrecVo.getContent());
         firstPageRecordDoc.setPageData(medrecVo.getContent());
 
 
         return firstPageRecordDoc;
         return firstPageRecordDoc;
-
 //        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 //        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 //
 //
-//        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 //
 //
 //        FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
 //        FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
 //        firstPageRecordDoc.setStructureMap(structureMap);
 //        firstPageRecordDoc.setStructureMap(structureMap);