|
@@ -3,10 +3,8 @@ package com.lantone.qc.trans.taizhou;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
|
|
import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
-import com.lantone.qc.pub.util.MapUtil;
|
|
|
|
|
|
+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 com.lantone.qc.trans.taizhou.util.TzXmlUtil;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -23,21 +21,16 @@ public class TaiZhouDoctorAdviceDocTrans extends ModelDocTrans {
|
|
List<DoctorAdviceDoc> retList = Lists.newArrayList();
|
|
List<DoctorAdviceDoc> retList = Lists.newArrayList();
|
|
List<String> contents = (List) medrecVo.getContent().get("content");
|
|
List<String> contents = (List) medrecVo.getContent().get("content");
|
|
contents.forEach(content -> {
|
|
contents.forEach(content -> {
|
|
- retList.add(getDoctorAdviceDoc(content));
|
|
|
|
|
|
+ retList.add(getDoctorAdviceDoc((Map) FastJsonUtils.getJsonToMap(content)));
|
|
});
|
|
});
|
|
return retList;
|
|
return retList;
|
|
}
|
|
}
|
|
|
|
|
|
- private DoctorAdviceDoc getDoctorAdviceDoc(String content) {
|
|
|
|
- MapUtil.consoleKey(TzXmlUtil.getXmlToMapForTZ(content));
|
|
|
|
- Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
|
|
|
|
-
|
|
|
|
|
|
+ private DoctorAdviceDoc getDoctorAdviceDoc(Map<String, String> content) {
|
|
DoctorAdviceDoc doctorAdviceDoc = new DoctorAdviceDoc();
|
|
DoctorAdviceDoc doctorAdviceDoc = new DoctorAdviceDoc();
|
|
- doctorAdviceDoc.setStructureMap(structureMap);
|
|
|
|
-
|
|
|
|
|
|
+ doctorAdviceDoc.setStructureMap(content);
|
|
|
|
+ doctorAdviceDoc.setPageData((Map) content);
|
|
return doctorAdviceDoc;
|
|
return doctorAdviceDoc;
|
|
}
|
|
}
|
|
|
|
|
|
- private List<String> keyContrasts = Lists.newArrayList();
|
|
|
|
-
|
|
|
|
}
|
|
}
|