jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -18,6 +18,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; @@ -133,4 +134,24 @@ return success(list3); } } @GetMapping(value = {"/list-all-bed"}) @Operation(summary = "获取诊床列表", description = "主要用于前端的开诊管理") public CommonResult<Map<Long, List<RoomRespVO>>> getAllBedMap() { RoomPageReqVO pageReqVO = new RoomPageReqVO(); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List<RoomDO> 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)); 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)); } } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomPageReqVO.java
@@ -24,6 +24,9 @@ @Schema(description = "诊疗床编号") private String bedNo; @Schema(description = "开诊状态") private Boolean onstage; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java
@@ -28,6 +28,10 @@ @ExcelProperty("诊疗床编号") private String bedNo; @Schema(description = "开诊状态", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("开诊状态") private Boolean onstage; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSaveReqVO.java
@@ -1,10 +1,12 @@ package cn.lihu.jh.module.ecg.controller.admin.room.vo; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.*; @@ -26,4 +28,8 @@ @NotEmpty(message = "诊疗床编号不能为空") private String bedNo; @Schema(description = "开诊状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull private Boolean onstage; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
@@ -31,4 +31,7 @@ @Select({ "SELECT room_id, count(1) as bed_num FROM lihu.clinic_room group by room_id;" }) List<RoomStatisticsDO> roomStatistic(); @Select({ "SELECT room_id, room_name FROM lihu.clinic_room group by room_id;" }) List<RoomDO> simpleRoomList(); } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java
@@ -56,4 +56,6 @@ PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO); List<RoomStatisticsDO> roomStatistics(); List<RoomDO> simpleRoomList(); } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
@@ -78,4 +78,9 @@ public List<RoomStatisticsDO> roomStatistics() { return roomMapper.roomStatistic(); } @Override public List<RoomDO> simpleRoomList() { return roomMapper.simpleRoomList(); } } sql/mysql/jh.sql
@@ -74,6 +74,7 @@ `room_id` BIGINT NOT NULL COMMENT '诊室编号', `room_name` varchar(10) NOT NULL COMMENT '诊室名称', `bed_no` varchar(10) NOT NULL COMMENT '诊疗床编号', `onstage` bit(1) 1 COMMENT '开诊', `tenant_id` int NOT NULL COMMENT '租户编号', `creator` varchar(10) DEFAULT '' COMMENT '创建者', `create_time` datetime NOT NULL COMMENT '创建时间',
