From 7bc725bea3fa8e02e952635dcbb1a493e4a74a13 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 12 十月 2024 11:41:41 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 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 f9bd92d..1fcbd19 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
@@ -26,7 +26,7 @@
 import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
 import cn.lihu.jh.framework.common.pojo.PageResult;
 import cn.lihu.jh.framework.common.util.object.BeanUtils;
-import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
 import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
 import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
@@ -49,7 +49,7 @@
     private OAuth2TokenApi oAuth2TokenApi;
 
     @Resource
-    private queueMapper queueMapper;
+    private QueueMapper queueMapper;
 
     @Resource
     private RoomMapper roomMapper;
@@ -218,9 +218,16 @@
     }
 
     @Override
-    public void startHurryUp() {
+    public void startHurryUpOneBed(Long roomId, String bedNo) {
         singleThreadExecutor.execute( () -> {
-            queueServiceTxFunctions.hurryup();
+            queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
+        });
+    }
+
+    @Override
+    public void startHurryUpOneCheckType(Integer checkType) {
+        singleThreadExecutor.execute( () -> {
+            queueServiceTxFunctions.hurryupOneCheckType( checkType );
         });
     }
 
@@ -228,7 +235,7 @@
     public void startBedReload() {
         singleThreadExecutor.execute( () -> {
             queueServiceTxFunctions.bedReload();
-            queueServiceTxFunctions.hurryup();
+            queueServiceTxFunctions.hurryupAllBed();
             queueServiceTxFunctions.monitorInfo();
         });
     }
@@ -296,10 +303,32 @@
         devRent.setState( DevRentStateEnum.FREE.getState() );
         devRentMapper.insert(devRent);
 
-        startHurryUp();
+        startHurryUpOneCheckType( queue.getBookCheckType() );
     }
 
+    // 甯歌妫�鏌� 鍙彿
+    @Override
     public void finishNextPatient(Long roomId, String bedNo) {
+        // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
+        Integer ret =  queueMapper.updateQueueStatus(roomId, bedNo,
+                QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+        startNextPatient(roomId, bedNo);
+    }
+
+    // 棰嗙敤 鍙彿
+    @Override
+    public void finishReceiveNextPatient(Long roomId, String bedNo) {
+        // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
+        Integer ret =  queueMapper.updateQueueStatus(roomId, bedNo,
+                QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+
+        startNextPatient(roomId, bedNo);
+    }
+
+    // 瑁呮満 鍙彿
+    @Override
+    public void finishInstallNextPatient(Long roomId, String bedNo) {
         // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
         Integer ret =  queueMapper.updateQueueStatus(roomId, bedNo,
                 QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
@@ -315,8 +344,14 @@
         startNextPatient(roomId, bedNo);
     }
 
-    public List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
-        List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, statusList);
+    public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
+        List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, statusList);
+        return queueDOList;
+    }
+
+    @Override
+    public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Byte> statusList) {
+        List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
         return queueDOList;
     }
 
@@ -341,8 +376,8 @@
         return patientStatisticVO;
     }
 
-    public void setCheckTypeReadyMax(Map<Integer, Integer> max) {
-        queueServiceTxFunctions.setCheckTypeReadyMax( max );
+    public void initCheckType() {
+        queueServiceTxFunctions.initCheckType( );
     }
 
     public void startBiz() {
@@ -362,14 +397,16 @@
     public Integer recallPatient(Long roomId, String bedNo, String patId) {
         Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
                 QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
-        startHurryUp();
+        startHurryUpOneBed(roomId, bedNo);
         return updateNum;
     }
 
     @Override
     public Integer patientJump(String patId, Byte jumped) {
         Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
-        startHurryUp();
+
+        QueueDO queueDO = queueMapper.getQueueByPatId(patId);
+        startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
         return updateNum;
     }
 

--
Gitblit v1.9.3