From fc8492c1a1143ef2466c8dca219b82fc5bf6550c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 12 十月 2024 15:56:14 +0800
Subject: [PATCH] 队列状态 更新逻辑调整

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   79 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 insertions(+), 9 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 bc007a9..4485429 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,6 +218,25 @@
     }
 
     @Override
+    public ErrorCode startNextInstallPatient(Long roomId, String bedNo) {
+        Future<ErrorCode> future = singleThreadExecutor.submit(
+                new BedDoctorNextInstallPatientCallable(queueServiceTxFunctions, roomId, bedNo)
+        );
+
+        try {
+            ErrorCode ret = future.get();
+            return ret;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        }
+
+        System.out.println("startNextInstallPatient ========");
+        return ECG_INNER_ERROR;
+    }
+
+    @Override
     public void startHurryUpOneBed(Long roomId, String bedNo) {
         singleThreadExecutor.execute( () -> {
             queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
@@ -303,27 +322,69 @@
         devRent.setState( DevRentStateEnum.FREE.getState() );
         devRentMapper.insert(devRent);
 
-        startHurryUpOneCheckType(Integer.valueOf(queue.getBookCheckType()));
+        startHurryUpOneCheckType( queue.getBookCheckType() );
     }
 
+    // 甯歌妫�鏌� 鍙彿
+    @Override
     public void finishNextPatient(Long roomId, String bedNo) {
         // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
-        Integer ret =  queueMapper.updateQueueStatus(roomId, bedNo,
+        Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
                 QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
 
         startNextPatient(roomId, bedNo);
     }
 
+    // 棰嗙敤 鍙彿
+    @Override
+    public void finishReceiveNextPatient(Long roomId, String bedNo) {
+        // 浠� DB 鎶� [灏辫瘖涓璢 鐨勪汉 璁剧疆涓� 銆愬凡棰嗙敤銆�
+        //Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
+        //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+
+        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
+        List<Byte> queueStatusList = new ArrayList<>();
+        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+        Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
+        if ( num != null && num > 0)
+            return;
+
+        startNextPatient(roomId, bedNo);
+    }
+
+    // 瑁呮満 鍙彿
+    @Override
+    public void finishInstallNextPatient(Long roomId, String bedNo) {
+        // 浠� DB 鎶� [瀹夎涓璢 鐨勪汉 璁剧疆涓� [宸插氨璇奭
+        //Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
+        //        QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
+        List<Byte> queueStatusList = new ArrayList<>();
+        queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
+        Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
+        if ( num != null && num > 0)
+            return;
+
+        startNextInstallPatient(roomId, bedNo);
+    }
+
     public void passNextPatient(Long roomId, String bedNo) {
         // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓鸿繃鍙�
-        Integer ret =  queueMapper.updateQueueStatus(roomId, bedNo,
+        Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
                 QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
 
         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;
     }
 
@@ -348,8 +409,8 @@
         return patientStatisticVO;
     }
 
-    public void setCheckTypeReadyMax(Map<Integer, Integer> max) {
-        queueServiceTxFunctions.setCheckTypeReadyMax( max );
+    public void initCheckType() {
+        queueServiceTxFunctions.initCheckType( );
     }
 
     public void startBiz() {

--
Gitblit v1.9.3