|
@@ -27,10 +27,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Component
|
|
@Component
|
|
public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
@@ -191,7 +188,17 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
content.add(aColumnContentVO);
|
|
content.add(aColumnContentVO);
|
|
});
|
|
});
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
- map.put("content", content);
|
|
|
|
|
|
+ List<Map<String, Object>> returnData = new ArrayList<>();
|
|
|
|
+ for (AColumnContentVO aColumnContentVO : content) {
|
|
|
|
+ try {
|
|
|
|
+ Map<String, Object> objectMap = MapUtil.objectToMap(aColumnContentVO);
|
|
|
|
+ returnData.add(objectMap);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ map.put("content", returnData);
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
medrecVo.setTitle(ModeIdEnum.getName(Integer.parseInt(modeId.toString())));
|
|
medrecVo.setTitle(ModeIdEnum.getName(Integer.parseInt(modeId.toString())));
|
|
medrecVo.setContent(map);
|
|
medrecVo.setContent(map);
|