From cce9d33e6c03ab48fb22c62fe5de3d1e902c598f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 14:25:51 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java |   70 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
index cb0abad..92c5998 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -3,8 +3,10 @@
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO;
 import cn.lihu.jh.module.ecg.service.room.RoomService;
+import cn.lihu.jh.module.system.api.dept.DeptApi;
+import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.validation.annotation.Validated;
@@ -15,6 +17,7 @@
 
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 import cn.lihu.jh.framework.common.pojo.PageParam;
 import cn.lihu.jh.framework.common.pojo.PageResult;
@@ -41,6 +44,9 @@
 
     @Resource
     private RoomService roomService;
+
+    @Resource
+    private DeptApi deptApi;
 
     @PostMapping("/create")
     @Operation(summary = "鍒涘缓璇婂鍜岃瘖鐤楀簥")
@@ -71,7 +77,7 @@
     @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('clinic:room:query')")
     public CommonResult<RoomRespVO> getRoom(@RequestParam("id") Integer id) {
-        RoomDO room = roomService.getRoom(id);
+        RoomResVO room = roomService.getRoom(id);
         return success(BeanUtils.toBean(room, RoomRespVO.class));
     }
 
@@ -79,7 +85,7 @@
     @Operation(summary = "鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉")
     @PreAuthorize("@ss.hasPermission('clinic:room:query')")
     public CommonResult<PageResult<RoomRespVO>> getRoomPage(@Valid RoomPageReqVO pageReqVO) {
-        PageResult<RoomDO> pageResult = roomService.getRoomPage(pageReqVO);
+        PageResult<RoomResVO> pageResult = roomService.getRoomPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RoomRespVO.class));
     }
 
@@ -90,10 +96,64 @@
     public void exportRoomExcel(@Valid RoomPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList();
+        List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList();
         // 瀵煎嚭 Excel
         ExcelUtils.write(response, "璇婂鍜岃瘖鐤楀簥.xls", "鏁版嵁", RoomRespVO.class,
                         BeanUtils.toBean(list, RoomRespVO.class));
     }
 
-}
\ No newline at end of file
+    @GetMapping(value = {"/list-all-simple", "/simple-list"})
+    @Operation(summary = "鑾峰彇閮ㄩ棬绮剧畝淇℃伅鍒楄〃", description = "鍙寘鍚寮�鍚殑閮ㄩ棬锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
+    public CommonResult<List<RoomRespVO>> getSimpleDeptList() {
+
+        List<DeptRespDTO> deptRespDTOList = deptApi.getSimpleDeptList();
+        Optional<DeptRespDTO> ecgDept = deptRespDTOList.stream()
+                .filter(a -> a.getName().equals("ECG"))
+                .findAny();
+
+        List<DeptRespDTO> list2 = new ArrayList<DeptRespDTO>();
+        if (ecgDept.isPresent()){
+            System.out.println(ecgDept.get().getName());
+
+            list2 = deptRespDTOList.stream()
+                    .filter(a -> Objects.equals(a.getParentId(), ecgDept.get().getId()))
+                    .toList();
+            list2.forEach(System.out::println);
+            list2.size();
+        }
+
+        List<RoomRespVO> list3 = list2.stream().map(item -> {
+            RoomRespVO roomRespVO = new RoomRespVO();
+            roomRespVO.setRoomId( item.getId() );
+            roomRespVO.setRoomName( item.getName() );
+            return roomRespVO;
+        }).toList();
+
+        //return success(BeanUtils.toBean(list2, RoomRespVO.class));
+        return success(list3);
+    }
+
+    @GetMapping(value = {"/list-all-bed"})
+    @Operation(summary = "鑾峰彇璇婂簥鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勫紑璇婄鐞�")
+    public CommonResult<Map<String, List<RoomRespVO>>> getAllBedMap() {
+
+        RoomPageReqVO pageReqVO = new RoomPageReqVO();
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList();
+
+        List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
+
+        Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
+        return success(map);
+    }
+
+    @GetMapping(value = {"/list-simple-room"})
+    @Operation(summary = "鑾峰彇闂ㄨ瘖瀹ゅ垪琛�", description = "涓昏鐢ㄤ簬鍓嶇鐨勮瘖瀹ら�夋嫨")
+    public CommonResult<Map<String, List<RoomRespVO>>> getSimpleRoomList() {
+        List<RoomResVO> list = roomService.simpleRoomList();
+        List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
+
+        Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
+        return success(map);
+    }
+}

--
Gitblit v1.9.3