From 0980c29c1948b1901fa834f86ffb5884a09223d5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 10 十二月 2024 20:51:48 +0800
Subject: [PATCH] checktype 新增是否需要确费
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 9e70728..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
@@ -1,5 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.devmanage;
+import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordPageReqVO;
+import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordStatisticVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceStatisticDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordStatisticDO;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -107,9 +111,32 @@
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);
}
-}
\ No newline at end of file
+ @GetMapping("/dev-statistic")
+ @Operation(summary = "璁惧缁熻")
+ @PreAuthorize("@ss.hasPermission('ecg:device:statistic')")
+ public CommonResult<List<DeviceStatisticVO>> getDeviceStatistic(@Valid DevicePageReqVO pageReqVO) {
+ List<DeviceStatisticDO> statisticDOList = deviceService.getDeviceStatistic(pageReqVO);
+ return success(BeanUtils.toBean(statisticDOList, DeviceStatisticVO.class));
+ }
+
+}
--
Gitblit v1.9.3