From 01a81beea99c0298a3b6178c7796f4c27b30c6c7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 14:27:50 +0800
Subject: [PATCH] pat detail.  新增 appontment_id

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
index ba66599..42ad66f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -284,8 +284,8 @@
             return error(ROOM_NOT_SIT);
         }
 
-        BedQueueBO bedQueueBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
-        if (null == bedQueueBO) {
+        BedBO bedBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
+        if (null == bedBO) {
             log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
             return error(QUEUE_BED_NOT_EXIST);
         }
@@ -590,7 +590,7 @@
      * @return
      */
     @Override
-    public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) {
+    public List<QueueDO> getCheckRelatedPatient(Long roomId, String bedNo) {
         List<Integer> queueStatusList = new ArrayList<>();
         queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
         queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -628,16 +628,16 @@
      * @return
      */
     @Override
-    public List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo) {
+    public List<QueueDO> getInstallRelatedPatient(Long roomId, String bedNo) {
         List<Integer> queueStatusList = new ArrayList<>();
         queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
         queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
         queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
+        queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
         List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList); // 鍙互鐪嬪埌鏈瘖瀹� 寰呭畨瑁呯殑鎮h��
 
         queueStatusList.clear();
         queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
-        queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
         queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList) ); // 褰撳墠宸ヤ綅鐨�
 
         //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰

--
Gitblit v1.9.3