From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
index 239a208..58beb4d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
@@ -23,6 +23,22 @@
CommonResult<Long> registerOperation(@Valid DevRentSaveReqVO createReqVO);
/**
+ * 甯歌妫�鏌� 瀹屾垚
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ CommonResult<Long> routineFinishOperation(@Valid RoutineFinishReqVO createReqVO);
+
+ /**
+ * 璁惧鍑嗗
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ CommonResult<Long> readyOperation(@Valid DevRentSaveReqVO createReqVO);
+
+ /**
* 瑁呮満
*
* @param createReqVO 鍒涘缓淇℃伅
@@ -39,12 +55,37 @@
Long dismantleOperation(@Valid DevRentSaveReqVO createReqVO);
/**
- * 瑁呮満
+ * 鏁版嵁褰曞叆
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ Long dataEntryOperation(@Valid DevRentSaveReqVO createReqVO);
+
+
+ /**
+ * 甯歌妫�鏌� 鍙栨秷
*
* @param cancelReqVO 鍒涘缓淇℃伅
* @return 缂栧彿
*/
- CommonResult<Long> cancelOperation(@Valid DevCancelReqVO cancelReqVO);
+ CommonResult<Long> cancelRoutineOperation(@Valid DevCancelReqVO cancelReqVO);
+
+ /**
+ * 鍙栨秷棰嗙敤
+ *
+ * @param cancelReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ CommonResult<Long> cancelReadyOperation(@Valid DevCancelReqVO cancelReqVO);
+
+ /**
+ * 鍙栨秷瑁呮満
+ *
+ * @param cancelReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ CommonResult<Long> cancelInstallOperation(@Valid DevCancelReqVO cancelReqVO);
/**
* 閬楀け
@@ -52,7 +93,7 @@
* @param createReqVO 鍒涘缓淇℃伅
* @return 缂栧彿
*/
- CommonResult<Long> loseOperation(@Valid DevRentSaveReqVO createReqVO);
+ CommonResult<Long> dismantleExceptionOperation(@Valid DevRentSaveReqVO createReqVO);
/**
* 鍒涘缓瑁呮満鎷嗘満
@@ -92,5 +133,10 @@
*/
PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO);
- DevRentDO getDismantleRent(DevRentSearchReqVO searchReqVO);
+ DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO);
+ DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO);
+ DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO);
+ DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO);
+
+ Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel);
}
\ No newline at end of file
--
Gitblit v1.9.3