From f696df5ce36beb3af261bae782fa0a418b83b9e6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 15:41:18 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 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 88f81ef..413f552 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;
@@ -96,16 +99,32 @@
@Operation(summary = "寮�璇婅缃�")
@PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
public CommonResult<Integer> openingSetting() {
- queueService.initQueue();
+ // 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪, 鍙兘鏈夋柊寮�宸ヤ綅
+ queueService.initBedQueueAndSeqNumFromDB();
return success(0);
}
- @GetMapping("/reorder")
- @Operation(summary = "寮�璇婂墠涓�鍒伙紝瀵瑰氨璇婂噯澶囩殑浜哄憳閲嶆柊鎺掑簭")
+ @GetMapping("/startbiz")
+ @Operation(summary = "鎵嬪姩寮�璇�")
@PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
- public CommonResult<Integer> queueReorder() {
- queueService.reorderQueue();
+ public CommonResult<Integer> startBiz() {
+ queueService.startBiz();
return success(0);
}
-}
\ No newline at end of file
+ @GetMapping("/patient-jump")
+ @Operation(summary = "鎻掗槦")
+ @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", 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