From 8809479970c94c3eb1225e73cb5e48ab8f460e61 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 31 三月 2025 16:50:53 +0800
Subject: [PATCH] remove obsolete file
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 924cf0d..ebd507b 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
@@ -55,18 +55,46 @@
// 甯歌妫�鏌� 瀹屾垚
@PostMapping("/routine-finish")
- @Operation(summary = "")
+ @Operation(summary = "甯歌妫�鏌ュ畬鎴�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
+
+ // 鎶� 鎺掗槦 鎮ｈ��
+ queueService.startHurryUpOneBed(routineFinishReqVO.getRoomId(), routineFinishReqVO.getBedNo());
+
+ // 鑷姩纭垂
+ try {
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+ Long rentId = routineFinishReqVO.getId();
+ devRentService.feeConfirm(rentId, userHisId, userNickname, true); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+ } catch (Exception e) {
+ log.error("甯歌妫�鏌ュ畬鎴�, 鑷姩纭垂澶辫触", e);
+ }
+
return result;
}
@PostMapping("/dev-ready")
- @Operation(summary = "璁惧棰嗙敤")
+ @Operation(summary = "璁惧棰嗙敤瀹屾垚")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
CommonResult<Long> result = devRentService.readyOperation(createReqVO);
+
+ // 鎶� 鎺掗槦 鎮ｈ��
+ queueService.startHurryUpOneBed(createReqVO.getRoomId(), createReqVO.getBedNo());
+
+ // 鑷姩纭垂
+ try {
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+ Long rentId = createReqVO.getId();
+ devRentService.feeConfirm(rentId, userHisId, userNickname, true); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+ } catch (Exception e) {
+ log.error("璁惧棰嗙敤瀹屾垚, 鑷姩纭垂澶辫触", e);
+ }
+
return result;
}
--
Gitblit v1.9.3