From ca64d931ce30254e34d64ce28cf3a53e54a9159f Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 26 八月 2024 09:32:50 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java index 12c988c..3174a56 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java @@ -1,5 +1,6 @@ package cn.lihu.jh.module.ecg.controller.admin.queue; +import cn.lihu.jh.framework.common.exception.ErrorCode; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -14,6 +15,8 @@ import cn.lihu.jh.framework.common.pojo.PageResult; import cn.lihu.jh.framework.common.pojo.CommonResult; import cn.lihu.jh.framework.common.util.object.BeanUtils; + +import static cn.lihu.jh.framework.common.pojo.CommonResult.error; import static cn.lihu.jh.framework.common.pojo.CommonResult.success; import cn.lihu.jh.framework.excel.core.util.ExcelUtils; @@ -92,12 +95,15 @@ BeanUtils.toBean(list, QueueRespVO.class)); } - @GetMapping("/opening-setting") - @Operation(summary = "寮�璇婅缃�") - @PreAuthorize("@ss.hasPermission('ecg:queue:setting')") - public CommonResult<Integer> openingSetting() { - // 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪, 鍙兘鏈夋柊寮�宸ヤ綅 - queueService.initQueue(); + @GetMapping("/bed-control") + @Operation(summary = "宸ヤ綅鎺у埗") + @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')") + public CommonResult<Integer> bedControl( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo, + @RequestParam("status") Integer status) + { + queueService.bedControl(roomId, bedNo, status); return success(0); } @@ -109,4 +115,19 @@ return success(0); } + @GetMapping("/patient-jump") + @Operation(summary = "鎻掗槦") + @Parameter(name = "patId", description = "鎮h�呯紪鍙�", required = true, example = "B2") + @PreAuthorize("@ss.hasPermission('ecg:queue:jump')") + public CommonResult<String> queueJump( + @RequestParam("patId") String patId, + @RequestParam("jumpFlag") Byte jumpFlag) + { + Integer result = queueService.patientJump(patId, jumpFlag); + if (null == result || 0 == result) + return error( new ErrorCode(201, "鎵句笉鍒版偅鑰�") ); + + return success("success"); + } + } -- Gitblit v1.9.3