update

eight

2024-08-28 cce9d33e6c03ab48fb22c62fe5de3d1e902c598f

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java

@@ -1,10 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.room;

import cn.lihu.jh.framework.common.enums.CommonStatusEnum;
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;
@@ -78,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));
    }

@@ -86,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));
    }

@@ -97,7 +96,7 @@
    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));
@@ -136,22 +135,25 @@

    @GetMapping(value = {"/list-all-bed"})
    @Operation(summary = "获取诊床列表", description = "主要用于前端的开诊管理")
    public CommonResult<Map<Long, List<RoomRespVO>>> getAllBedMap() {
    public CommonResult<Map<String, List<RoomRespVO>>> getAllBedMap() {

        RoomPageReqVO pageReqVO = new RoomPageReqVO();
        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList();
        List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList();

        List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);

        Map<Long, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomId));
        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<List<RoomRespVO>> getSimpleRoomList() {
        List<RoomDO> list = roomService.simpleRoomList();
        return success(BeanUtils.toBean(list, RoomRespVO.class));
    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);
    }
}