diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java index 8d6b0a4..6aba968 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java @@ -99,7 +99,7 @@ public class LisCrisisItemController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/syncLisCrisisData") @ResponseBody - public List getSyncLisCrisis(@RequestHeader("Authorization") String token, + public List> getSyncLisCrisis(@RequestHeader("Authorization") String token, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit) { @@ -115,7 +115,31 @@ public class LisCrisisItemController extends BaseController { query.setPage(page); List lisCrisisItemList = lisCrisisItemService.query(query); - return lisCrisisItemList; + + List> list = new ArrayList<>(); + + if (CollectionUtils.isNotEmpty(lisCrisisItemList)) { + for (LisCrisisItem data : lisCrisisItemList) { + Map map = new HashMap<>(); + Map content = new HashMap<>(); + map.put("emergenceId", data.getId()); + map.put("hospitalId", data.getHospitalId()); + content.put("type", data.getItemName()); + content.put("ref", data.getRef() + " " + data.getUnit()); + content.put("real", data.getResult() + " " + data.getUnit()); + map.put("content", JsonUtil.obj2JsonString(content)); + map.put("applyDoctorCode", data.getApplyDoctorCode()); + map.put("applyDoctorName", data.getApplyDoctorName()); + map.put("publishTime", DateUtil.getyyyy_MM_dd(data.getPublishTime())); + map.put("status", data.getStatus()); + map.put("statusName", data.getStatusName()); + map.put("patientId", data.getPatientId()); + list.add(map); + } + } + + + return list; }