From 25ef09df68cd79b9c75bb88ee8ee039b58ce5690 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 22:20:06 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 375 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 276 insertions(+), 99 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 fd31e8c..95713d6 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
@@ -1,28 +1,43 @@
package cn.lihu.jh.module.ecg.service.queue;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Resource;
+
+import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
+import cn.lihu.jh.module.ecg.Utils;
+import cn.lihu.jh.module.ecg.config.DynamicSchedulingConfig;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-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.service.room.RoomService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.config.CronTask;
+import org.springframework.scheduling.config.ScheduledTask;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
+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.infra.api.config.ConfigApi;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
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 javax.annotation.Resource;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
+import static cn.lihu.jh.module.ecg.Constants.ECG_OPENING_TIME_KEY;
+import static cn.lihu.jh.module.ecg.Constants.ECG_ROOM_RESET_TIME_KEY;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -32,6 +47,7 @@
*/
@Service
@Validated
+@Slf4j
public class QueueServiceImpl implements QueueService {
@Resource
@@ -41,7 +57,6 @@
private RoomMapper roomMapper;
AtomicInteger openingFlag = new AtomicInteger(0);
-
AtomicInteger curSeqNum = new AtomicInteger(0);
PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
@@ -49,6 +64,7 @@
ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
+ Integer queueReadyMax = 0;
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -77,11 +93,11 @@
}
@Override
- public Integer startBedOpen(Long roomId, String bedNo) {
- Future<Integer> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, bedNo));
+ public ErrorCode startBedOpen(Long roomId, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, bedNo));
try {
- Integer ret = future.get();
+ ErrorCode ret = future.get();
return ret;
} catch (InterruptedException e) {
e.printStackTrace();
@@ -89,15 +105,16 @@
e.printStackTrace();
}
- return 100;
+ System.out.println("startBedOpen ========");
+ return ECG_INNER_ERROR;
}
@Override
- public Integer startBedClose(Long roomId, String bedNo) {
- Future<Integer> future = singleThreadExecutor.submit( new BedCloseCallable(this, roomId, bedNo));
+ public ErrorCode startBedClose(Long roomId, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedCloseCallable(this, roomId, bedNo));
try {
- Integer ret = future.get();
+ ErrorCode ret = future.get();
return ret;
} catch (InterruptedException e) {
e.printStackTrace();
@@ -105,17 +122,18 @@
e.printStackTrace();
}
- return 100;
+ System.out.println("startBedClose ========");
+ return ECG_INNER_ERROR;
}
@Override
- public Integer startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
- Future<Integer> future = singleThreadExecutor.submit(
+ public ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
new BedDoctorPauseCallable(this, roomId, bedNo, docId, docName)
);
try {
- Integer ret = future.get();
+ ErrorCode ret = future.get();
return ret;
} catch (InterruptedException e) {
e.printStackTrace();
@@ -123,17 +141,37 @@
e.printStackTrace();
}
- return 100;
+ System.out.println("startBedDoctorPause ========");
+ return ECG_INNER_ERROR;
}
@Override
- public Integer startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
- Future<Integer> future = singleThreadExecutor.submit(
+ public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorResumeCallable(this, roomId, bedNo, docId, docName)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ System.out.println("startBedDoctorResume ========");
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
new BedDoctorOnCallable(this, roomId, bedNo, docId, docName)
);
try {
- Integer ret = future.get();
+ ErrorCode ret = future.get();
return ret;
} catch (InterruptedException e) {
e.printStackTrace();
@@ -141,17 +179,18 @@
e.printStackTrace();
}
- return 100;
+ System.out.println("startBedDoctorOn ========");
+ return ECG_INNER_ERROR;
}
@Override
- public Integer startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
- Future<Integer> future = singleThreadExecutor.submit(
+ public ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
new BedDoctorOffCallable(this, roomId, bedNo, docId, docName)
);
try {
- Integer ret = future.get();
+ ErrorCode ret = future.get();
return ret;
} catch (InterruptedException e) {
e.printStackTrace();
@@ -159,9 +198,43 @@
e.printStackTrace();
}
- return 100;
+ System.out.println("startBedDoctorOff ========");
+ return ECG_INNER_ERROR;
}
+ @Override
+ public ErrorCode startNextPatient(Long roomId, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorNextPatientCallable(this, roomId, bedNo)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ System.out.println("startNextPatient ========");
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public void startHurryUp() {
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
+ }
+
+ @Override
+ public void startBedReload() {
+ singleThreadExecutor.execute( () -> {
+ bedReload();
+ hurryup();
+ });
+ }
/**
* 宸插叧闂� 鎴栬�� 鍏抽棴涓紝鍙互寮�閫氬伐浣�
@@ -170,15 +243,21 @@
* @return
*/
@Override
- public Integer bedOpen(Long roomId, String bedNo) {
+ public ErrorCode bedOpen(Long roomId, String bedNo) {
+ BedQueueBO bedQueueBO2 = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null != bedQueueBO2) {
+ log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_EXIST;
+ }
+
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.CLOSED);
- statusList.add(BedStatusEnum.CLOSING);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
- BedStatusEnum.OPENING, statusList);
- if ( null==updateNum || 0 == updateNum )
- return 310;
+ Integer updateNum = roomMapper.setBedOpeningOpening(roomId, bedNo, BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedOpen DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -188,81 +267,170 @@
BedQueueBO bedQueueBO = new BedQueueBO();
bedQueueBO.setRoomId(roomId);
bedQueueBO.setBedNo(bedNo);
- bedQueueBO.setMaxQueueNum(MAX_QUEUE_NUM);
+ bedQueueBO.setMaxQueueNum(queueReadyMax);
bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
+ bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
priorityQueue.offer(bedQueueBO);
mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);
- return 0;
+
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
- public Integer bedClose(Long roomId, String bedNo) {
+ public ErrorCode bedClose(Long roomId, String bedNo) {
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- if (null == bedQueueBO)
- return 320;
+ if (null == bedQueueBO) {
+ log.error("bedClose mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ // 闄や簡鍒ゆ柇 鍑嗗鍊欒瘖涓� 鐨勪汉鏁帮紝杩橀渶瑕� 鍒ゆ柇 杩囧彿鐨勪汉鏁�
+ //if (bedQueueBO.getQueueNum().get() >0)
+ // return QUEUE_HAVE_PATIENT;
+ List<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED_RETURN.getStatus());
+ List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
+ if (queueDOList.size() > 0)
+ return QUEUE_HAVE_PATIENT;
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.OPENING);
statusList.add(BedStatusEnum.DOCTOR_ON);
statusList.add(BedStatusEnum.PAUSE);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
- BedStatusEnum.CLOSING, statusList);
- if ( null==updateNum || 0 == updateNum )
- return 321;
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
+ BedStatusEnum.CLOSED, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedClose DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
- return 0;
+ mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
+ priorityQueue.remove(bedQueueBO);
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
- public Integer bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
+ public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
+ RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+ if (null == roomDO) {
+ return error(ROOM_NOT_SIT);
+ }
+
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- if (null == bedQueueBO)
- return 320;
+ if (null == bedQueueBO) {
+ log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return error(QUEUE_BED_NOT_EXIST);
+ }
+
+ RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
+ return success(roomRespVO);
+ }
+
+ @Override
+ public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO) {
+ log.error("bedDoctorPause mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName,
- BedStatusEnum.PAUSE, statusList);
- if ( null==updateNum || 0 == updateNum )
- return 331;
+ Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId, BedStatusEnum.PAUSE, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorPause DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
- return 0;
+ bedQueueBO.setStatus(BedStatusEnum.PAUSE.getStatus());
+ priorityQueue.remove(bedQueueBO);
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
- public Integer bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- if (null == bedQueueBO)
- return 320;
+ if (null == bedQueueBO || !bedQueueBO.getStatus().equals(BedStatusEnum.PAUSE.getStatus())) {
+ log.error("bedDoctorResume mapBedVsQueue DONOT existed OR NOT Paused. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.PAUSE);
+ Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId,
+ BedStatusEnum.DOCTOR_ON, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorResume DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
+
+ bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ if (!priorityQueue.contains(bedQueueBO)) {
+ priorityQueue.offer(bedQueueBO);
+ } else {
+ log.error("bedDoctorResume priorityQueue still exist!. " + roomId + " " + bedNo);
+ return ECG_INNER_ERROR;
+ }
+
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ @Override
+ public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO) {
+ log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.OPENING);
- Integer updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName,
- BedStatusEnum.DOCTOR_ON, statusList);
- if ( null==updateNum || 0 == updateNum )
- return 341;
+ Integer updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName, BedStatusEnum.DOCTOR_ON, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorOn DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
- return 0;
+ bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
- public Integer bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
+ public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- if (null == bedQueueBO)
- return 320;
+ if (null == bedQueueBO) {
+ log.error("bedDoctorOff mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId, docName,
- BedStatusEnum.OPENING, statusList);
- if ( null==updateNum || 0 == updateNum )
- return 351;
+ statusList.add(BedStatusEnum.PAUSE);
+ Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId, BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorOff DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
- return 0;
+ // 濡傛灉鏄湪 PAUSE 鐘舵�佺搴х殑锛岄渶瑕侀噸鏂板姞鍥� 浼樺厛闃熷垪
+ if (bedQueueBO.getStatus().equals(BedStatusEnum.PAUSE.getStatus())) {
+ if (!priorityQueue.contains(bedQueueBO)) {
+ priorityQueue.offer(bedQueueBO);
+ } else {
+ log.error("bedDoctorResume priorityQueue still exist!. " + roomId + " " + bedNo);
+ return ECG_INNER_ERROR;
+ }
+ }
+
+ bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ return GlobalErrorCodeConstants.SUCCESS;
}
private void validatequeueExists(Integer id) {
@@ -286,12 +454,20 @@
* 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
* 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
*/
- public void initBedQueueAndSeqNumFromDB() {
+ @Override
+ public ErrorCode bedReload() {
priorityQueue.clear();
mapBedVsQueue.clear();
+ // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
+ queueMapper.clearQueue();
+
// 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃
- List<RoomDO> roomDOList = roomMapper.simpleRoomList();
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.OPENING);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
// 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
@@ -300,19 +476,23 @@
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
bedQueueBOList.forEach(item -> {
- item.maxQueueNum = MAX_QUEUE_NUM;
+ item.maxQueueNum = queueReadyMax;
Optional<QueueStatisticDO> queueStatisticDOOptional = queueStatisticDOList.stream().filter(it->it.getRoomId()==item.roomId && it.getBedNo().equals(item.getBedNo())).findFirst();
int queueNum = queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0;
- if ( MAX_QUEUE_NUM < queueNum )
+ if ( queueReadyMax < queueNum )
throw new RuntimeException("init: exceed max queue number!");
item.queueNum.set( queueNum );
- priorityQueue.offer(item);
mapBedVsQueue.put(String.format("%09d%s", item.roomId, item.bedNo), item);
+ if (BedStatusEnum.PAUSE.getStatus() != item.getStatus()) {
+ priorityQueue.offer(item);
+ }
});
Integer num = queueMapper.getMaxSeqNum();
curSeqNum = new AtomicInteger(null == num ? 0 : num);
+
+ return GlobalErrorCodeConstants.SUCCESS;
}
/**
@@ -327,7 +507,7 @@
for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.procPassedReturnPatient(
+ Integer updateNum = queueMapper.queuePassedReturnPatient(
bedQueueBO.getRoomId(),
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
@@ -396,20 +576,17 @@
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
- if (0 == openingFlag.get())
- return;
-
startHurryUp();
}
- private void nextPatient(Long roomId, String bedNo) {
+ @Override
+ public ErrorCode nextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 灏辫瘖鍑嗗涓殑浜� 璁剧疆涓哄氨璇婁腑
Integer updateNum = queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
-
// 璇ュ伐浣� 娌℃湁 灏辫瘖鍑嗗涓� 浜哄憳
if (null == updateNum || 0 == updateNum) {
- return;
+ return QUEUE_NOT_READY_PATIENT;
}
// 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
@@ -418,7 +595,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- startHurryUp();
+ return GlobalErrorCodeConstants.SUCCESS;
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -426,7 +603,7 @@
Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
- nextPatient(roomId, bedNo);
+ startNextPatient(roomId, bedNo);
}
public void passNextPatient(Long roomId, String bedNo) {
@@ -434,7 +611,7 @@
Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
- nextPatient(roomId, bedNo);
+ startNextPatient(roomId, bedNo);
}
public List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
@@ -463,17 +640,17 @@
return patientStatisticVO;
}
+ @Override
+ public void setQueueReadyMax(Integer max) {
+ queueReadyMax = max;
+ }
+
public void startBiz() {
if (1 == openingFlag.get())
return;
- // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
- queueMapper.clearQueue();
-
- initBedQueueAndSeqNumFromDB();
-
openingFlag.set(1);
- hurryup();
+ startBedReload();
}
public void closeBiz() {
@@ -482,7 +659,7 @@
@Override
public Integer recallPatient(Long roomId, String bedNo, String patId) {
- Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
+ Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
startHurryUp();
return updateNum;
@@ -495,10 +672,10 @@
return updateNum;
}
- private void startHurryUp() {
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ @Override
+ public void monitorInfo() {
+ log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size()
+ + " opening " + openingFlag.get());
}
}
--
Gitblit v1.9.3