From 24b7c98e01c211e93f00293e6e4e96ba1b9db93f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 14:50:43 +0800
Subject: [PATCH] 常规检查 step 2

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index 738f5c4..6d32f25 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -50,13 +50,27 @@
     @Resource
     private QueueService queueService;
 
+    // 甯歌妫�鏌� 瀹屾垚
+    @PostMapping("/routine-finish")
+    @Operation(summary = "")
+    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+    public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
+        try {
+            CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
+            return result;
+        } catch ( RuntimeException runtimeException ) {
+            String err = ExceptionUtils.formatException( runtimeException );
+            log.error("routineFinish: " + err);
+            return CommonResult.error(DEV_INSTALL_EXCEPTION);
+        }
+    }
+
     @PostMapping("/dev-ready")
     @Operation(summary = "璁惧棰嗙敤")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
         try {
             CommonResult<Long> result = devRentService.readyOperation(createReqVO);
-            queueService.startHurryUpOneBed(createReqVO.getRoomId(), createReqVO.getBedNo());
             return result;
         } catch ( RuntimeException runtimeException ) {
             String err = ExceptionUtils.formatException( runtimeException );
@@ -107,7 +121,7 @@
     }
 
     @PostMapping("/dev-ready-cancel")
-    @Operation(summary = "鍙栨秷瑁呮満")
+    @Operation(summary = "鍙栨秷棰嗙敤")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
         try {

--
Gitblit v1.9.3