From 7105cd2dd94171feb6fa969f71f8f9ba491b0729 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 02 十二月 2024 14:25:08 +0800
Subject: [PATCH] 登出时退出所有的工位

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 cb90a2d..71f57c9 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
@@ -331,6 +331,8 @@
         queueMapper.insert(queue);
 
         DevRentDO devRent = BeanUtils.toBean(queueSaveReqVO, DevRentDO.class);
+        devRent.setApplyNo( queueSaveReqVO.getApplyNo() );
+        devRent.setEpisodeId( queueSaveReqVO.getEpisodeId() );
         devRent.setState( DevRentStateEnum.FREE.getState() );
         devRent.setPatDetails( queueSaveReqVO.getPatDetails() );
         devRent.setCheckType( queueSaveReqVO.getBookCheckType() );
@@ -385,6 +387,13 @@
             return;
 
         startNextInstallPatient(roomId, bedNo);
+    }
+
+    @Override
+    public void passWaitingPatient(String patId, Integer bookCheckType) {
+        // 浠� DB 鎶� 鎺掗槦涓殑浜� 璁剧疆涓� 杩囧彿-鎺掗槦涓�
+        Integer ret =  queueMapper.updatePatientQueueStatus(patId, bookCheckType,
+                QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.PASSED_WAITING.getStatus());
     }
 
     public void passNextPatient(Long roomId, String bedNo) {
@@ -461,6 +470,15 @@
         });
 
         return patientStatisticVO;
+    }
+
+    @Override
+    public Integer recallPassWaitingPatient(String patId, Integer bookCheckType) {
+        // 浠� DB 鎶� 杩囧彿-鎺掗槦涓殑浜� 璁剧疆涓� 鎺掗槦涓�
+        Integer ret =  queueMapper.updatePatientQueueStatus(patId, bookCheckType,
+                QueueStatusEnum.PASSED_WAITING.getStatus(), QueueStatusEnum.WAITING.getStatus());
+
+        return ret;
     }
 
     public PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo) {
@@ -561,7 +579,7 @@
     }
 
     @Override
-    public RoomDO getDocRoomInfo(Long docId) {
+    public List<RoomDO> getDocRoomInfo(Long docId) {
         return roomMapper.getRoomByDocId(docId);
     }
 

--
Gitblit v1.9.3