From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java
index 054b4a7..7b6c348 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java
@@ -111,9 +111,24 @@
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<DeviceDO> list = deviceService.getDevicePage(pageReqVO).getList();
+
+ List<DeviceRespFlattenVO> listFlatten = list.stream().map(deviceDO -> {
+ DeviceRespFlattenVO deviceRespFlattenVO = BeanUtils.toBean(deviceDO, DeviceRespFlattenVO.class);
+ if (null != deviceDO.getPatDetails()) {
+ deviceRespFlattenVO.setPatId(deviceDO.getPatDetails().getId());
+ deviceRespFlattenVO.setPatName(deviceDO.getPatDetails().getName());
+ deviceRespFlattenVO.setPatMobile(deviceDO.getPatDetails().getMobile());
+ deviceRespFlattenVO.setPatDeptCode(deviceDO.getPatDetails().getDeptCode());
+ deviceRespFlattenVO.setPatDeptDesc(deviceDO.getPatDetails().getDeptDesc());
+ deviceRespFlattenVO.setPatWardCode(deviceDO.getPatDetails().getWardCode());
+ deviceRespFlattenVO.setPatWardDesc(deviceDO.getPatDetails().getWardDesc());
+ deviceRespFlattenVO.setPatBedNo(deviceDO.getPatDetails().getBedNo());
+ }
+ return deviceRespFlattenVO;
+ }).toList();
+
// 瀵煎嚭 Excel
- ExcelUtils.write(response, "璁惧.xls", "鏁版嵁", DeviceRespVO.class,
- BeanUtils.toBean(list, DeviceRespVO.class));
+ ExcelUtils.write(response, "璁惧.xls", "鏁版嵁", DeviceRespFlattenVO.class, listFlatten);
}
@GetMapping("/dev-statistic")
--
Gitblit v1.9.3