jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
@@ -3,6 +3,7 @@ import cn.lihu.jh.framework.common.exception.ErrorCode; import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO; import cn.lihu.jh.module.ecg.enums.QueueStatusEnum; import cn.lihu.jh.module.ecg.service.config.EcgConfigService; import cn.lihu.jh.module.ecg.service.config.EcgConfigServiceImpl; import org.springframework.scheduling.config.ScheduledTaskRegistrar; @@ -154,4 +155,32 @@ ecgConfigService.resetScheduler(); return success(0); } @GetMapping("/calling-data") @Operation(summary = "大屏叫号数据") @PreAuthorize("@ss.hasPermission('ecg:queue:setting')") public CommonResult<List<QueueRespVO>> callingData( @RequestParam("waitingNum") Integer waitingNum, @RequestParam("passedNum") Integer passedNum) { List<QueueDO> queueDOList = queueService.callingData(waitingNum, passedNum); return success( BeanUtils.toBean(queueDOList, QueueRespVO.class) ); } @GetMapping("/room-screen-data") @Operation(summary = "诊间屏数据") @PreAuthorize("@ss.hasPermission('ecg:queue:setting')") public CommonResult<List<QueueRespVO>> callingDataRoom( @RequestParam("roomId") Long roomId, @RequestParam("bedNo") String bedNo) { List<Byte> queueStatusList = new ArrayList<>(); queueStatusList.add(QueueStatusEnum.READY.getStatus()); queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus()); queueStatusList.add(QueueStatusEnum.PASSED.getStatus()); List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList); return success(BeanUtils.toBean(queueDOList, QueueRespVO.class)); } } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomPageReqVO.java
@@ -1,5 +1,6 @@ package cn.lihu.jh.module.ecg.controller.admin.room.vo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -24,6 +25,9 @@ @Schema(description = "诊疗床编号") private String bedNo; @Schema(description = "诊室IP") private String ip; @Schema(description = "开诊状态") private Integer status;
@@ -28,6 +28,10 @@ @ExcelProperty("诊疗床编号") private String bedNo; @Schema(description = "诊室IP") @ExcelProperty("诊室IP") private String ip; @Schema(description = "开诊状态", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("开诊状态") private Integer status; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSaveReqVO.java
@@ -28,6 +28,9 @@ @NotEmpty(message = "诊疗床编号不能为空") private String bedNo; @Schema(description = "诊室IP") private String ip; @Schema(description = "开诊状态", requiredMode = Schema.RequiredMode.REQUIRED) private Integer status;
@@ -42,6 +42,11 @@ private String bedNo; /** * 诊室IP */ private String ip; /** * 诊疗床状态 * @see BedStatusEnum */ jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
@@ -118,4 +118,6 @@ Integer patientJump(String patId, Byte jumped ); void monitorInfo(); List<QueueDO> callingData(Integer waitingNum, Integer passedNum); } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -679,4 +679,10 @@ + " opening " + openingFlag.get()); } @Override public List<QueueDO> callingData(Integer waitingNum, Integer passedNum) { //queueMapper. return null; } } sql/mysql/jh.sql
@@ -54,6 +54,7 @@ `status` tinyint NOT NULL COMMENT '10:排队中 20:候诊准备 30:就诊中 40:就诊完成 50:过号 60:过期', `passed` tinyint DEFAULT '0' COMMENT '过号标记', `expired` tinyint DEFAULT '0' COMMENT '预约过期标记', `called` int DEFAULT '0' COMMENT '叫号状态 0 未播 1 已播 ', `jump_flag` tinyint DEFAULT '0' COMMENT '插队标记', `room_id` bigint DEFAULT '0' COMMENT '诊室编号', `room_name` varchar(10) DEFAULT '' COMMENT '诊室名称', @@ -69,7 +70,7 @@ KEY `idx_status` (`status`) USING BTREE, KEY `idx_seq_num` (`seq_num`) USING BTREE, KEY `idx_room_bed_status` (`room_id`,`bed_no`,`status`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排队表'; ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排队表'; -- ---------------------------- -- Table structure for clinic_room @@ -83,6 +84,7 @@ `status` int NOT NULL DEFAULT '0', `doc_id` bigint DEFAULT NULL, `doc_name` varchar(10) DEFAULT '', `ip` char(15) DEFAULT '', `creator` varchar(10) DEFAULT '' COMMENT '创建者', `create_time` datetime NOT NULL COMMENT '创建时间', `updater` varchar(10) DEFAULT '' COMMENT '更新者',
