From 04480e19c8b47c2cb469811d47679c923b82710d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 29 十一月 2024 15:21:27 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.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/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 432fe0c..d44becf 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
@@ -336,7 +336,12 @@
         devRent.setCheckType( queueSaveReqVO.getBookCheckType() );
         devRentMapper.insert(devRent);
 
-        startHurryUpOneCheckType( queue.getBookCheckType() );
+        //startHurryUpOneCheckType( queue.getBookCheckType() );
+    }
+
+    @Override
+    public List<QueueDO> selectBookSeqNumByAppointIdList(List<Long> appointIdList) {
+        return queueMapper.selectBookSeqNumByAppointIdList( appointIdList );
     }
 
     // 甯歌妫�鏌� 鍙彿
@@ -380,6 +385,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) {
@@ -456,6 +468,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) {
@@ -540,12 +561,18 @@
         return updateNum;
     }
 
+    /**
+     * 鍔犳��
+     * @param patId
+     * @param jumped
+     * @return
+     */
     @Override
     public Integer patientJump(String patId, Byte jumped) {
         Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
 
         QueueDO queueDO = queueMapper.getQueueByPatId(patId);
-        startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
+        //startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
         return updateNum;
     }
 
@@ -655,6 +682,7 @@
         if (!affinityItems.isEmpty()) {
             QueueDO queueItem = affinityItems.get(0);
             queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY_WAITING.getStatus()); // [浜插拰-鎺掗槦] 鐘舵��
+            queueSaveReqVO.setAffinityItem( 1 );
             queueSaveReqVO.setRoomId(queueItem.getRoomId());
             queueSaveReqVO.setRoomName(queueItem.getRoomName());
             queueSaveReqVO.setBedNo(queueItem.getBedNo());

--
Gitblit v1.9.3