From a21055c644b56fc44b56ed7e2bfe77a82e1b739d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 十月 2024 18:25:23 +0800
Subject: [PATCH] 检查类型 从 字典 换成 DB 表

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 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 f5224de..7e18a19 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
@@ -2,30 +2,26 @@
 
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Resource;
 
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
 import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
 import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
 import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
 import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
 import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
-import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
 import cn.lihu.jh.framework.common.exception.ErrorCode;
 import cn.lihu.jh.framework.common.pojo.CommonResult;
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
 import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
 import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
-import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
 import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
 import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
 import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
@@ -223,9 +219,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 );
         });
     }
 
@@ -233,15 +236,15 @@
     public void startBedReload() {
         singleThreadExecutor.execute( () -> {
             queueServiceTxFunctions.bedReload();
-            queueServiceTxFunctions.hurryup();
+            queueServiceTxFunctions.hurryupAllBed();
             queueServiceTxFunctions.monitorInfo();
         });
     }
 
     @Override
-    public void startResetRoom() {
+    public void startResetRoom(Boolean needCloseBed) {
         singleThreadExecutor.execute( () -> {
-            queueServiceTxFunctions.resetRoom();
+            queueServiceTxFunctions.resetRoom(needCloseBed);
             queueServiceTxFunctions.bedReload();
             queueServiceTxFunctions.monitorInfo();
         });
@@ -254,7 +257,7 @@
 
     @Override
     public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
-        RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+        RoomDO roomDO = roomMapper.getRoomByRoomBedDoc(roomId, bedNo, docId);
         if (null == roomDO) {
             return error(ROOM_NOT_SIT);
         }
@@ -301,7 +304,7 @@
         devRent.setState( DevRentStateEnum.FREE.getState() );
         devRentMapper.insert(devRent);
 
-        startHurryUp();
+        startHurryUpOneCheckType(Integer.valueOf(queue.getBookCheckType()));
     }
 
     public void finishNextPatient(Long roomId, String bedNo) {
@@ -346,9 +349,8 @@
         return patientStatisticVO;
     }
 
-    @Override
-    public void setQueueReadyMax(Integer max) {
-        queueServiceTxFunctions.setQueueReadyMax( max );
+    public void initCheckType() {
+        queueServiceTxFunctions.initCheckType( );
     }
 
     public void startBiz() {
@@ -368,14 +370,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