From a5305477214bf3bd69919c60c8b6e34827cad366 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 十月 2024 13:36:34 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 418 +++++++----------------------------------------------------
1 files changed, 49 insertions(+), 369 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 a2b2484..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,29 +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;
@@ -47,6 +44,12 @@
public class QueueServiceImpl implements QueueService {
@Resource
+ QueueServiceTxFunctions queueServiceTxFunctions;
+
+ @Resource
+ private OAuth2TokenApi oAuth2TokenApi;
+
+ @Resource
private queueMapper queueMapper;
@Resource
@@ -58,20 +61,7 @@
@Resource
private DevRentMapper devRentMapper;
- AtomicInteger openingFlag = new AtomicInteger(0);
- AtomicInteger curSeqNum = new AtomicInteger(0);
-
- PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
- ConcurrentHashMap<String, BedQueueBO > mapBedVsQueue = new ConcurrentHashMap<>();
-
ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
-
- Integer queueReadyMax = 0;
-
- Integer bigScrenWaitingSize = 5;
- Integer bigScrenPassedSize = 5;
- Integer bigScrenWaitingFrom = 0;
- Integer bigScrenPassedFrom = 0;
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -101,7 +91,7 @@
@Override
public ErrorCode startBedOpen(Long roomId, String roomName, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, roomName, bedNo));
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(queueServiceTxFunctions, roomId, roomName, bedNo));
try {
ErrorCode ret = future.get();
@@ -118,7 +108,7 @@
@Override
public ErrorCode startBedClose(Long roomId, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit( new BedCloseCallable(this, roomId, bedNo));
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedCloseCallable(queueServiceTxFunctions, roomId, bedNo));
try {
ErrorCode ret = future.get();
@@ -136,7 +126,7 @@
@Override
public ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorPauseCallable(this, roomId, bedNo, docId, docName)
+ new BedDoctorPauseCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
);
try {
@@ -155,7 +145,7 @@
@Override
public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorResumeCallable(this, roomId, bedNo, docId, docName)
+ new BedDoctorResumeCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
);
try {
@@ -174,7 +164,7 @@
@Override
public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorOnCallable(this, roomId, bedNo, docId, docName)
+ new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
);
try {
@@ -193,7 +183,7 @@
@Override
public ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorOffCallable(this, roomId, bedNo, docId, docName)
+ new BedDoctorOffCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
);
try {
@@ -212,7 +202,7 @@
@Override
public ErrorCode startNextPatient(Long roomId, String bedNo) {
Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorNextPatientCallable(this, roomId, bedNo)
+ new BedDoctorNextPatientCallable(queueServiceTxFunctions, roomId, bedNo)
);
try {
@@ -229,115 +219,50 @@
}
@Override
- public void startHurryUp() {
+ public void startHurryUpOneBed(Long roomId, String bedNo) {
singleThreadExecutor.execute( () -> {
- hurryup();
+ queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
+ });
+ }
+
+ @Override
+ public void startHurryUpOneCheckType(Integer checkType) {
+ singleThreadExecutor.execute( () -> {
+ queueServiceTxFunctions.hurryupOneCheckType( checkType );
});
}
@Override
public void startBedReload() {
singleThreadExecutor.execute( () -> {
- bedReload();
- hurryup();
- monitorInfo();
+ queueServiceTxFunctions.bedReload();
+ queueServiceTxFunctions.hurryupAllBed();
+ queueServiceTxFunctions.monitorInfo();
+ });
+ }
+
+ @Override
+ public void startResetRoom(Boolean needCloseBed) {
+ singleThreadExecutor.execute( () -> {
+ queueServiceTxFunctions.resetRoom(needCloseBed);
+ queueServiceTxFunctions.bedReload();
+ queueServiceTxFunctions.monitorInfo();
});
}
@Override
public MonitorInfoVO getMonitorInfo() {
- MonitorInfoVO monitorInfoVO = new MonitorInfoVO();
- monitorInfoVO.setOpeningFlag( openingFlag.get() );
- monitorInfoVO.setQueueNum( mapBedVsQueue.size() );
- monitorInfoVO.setActiveQueueNum( priorityQueue.size() );
- return monitorInfoVO;
- }
-
- /**
- * 宸插叧闂� 鎴栬�� 鍏抽棴涓紝鍙互寮�閫氬伐浣�
- * @param roomId
- * @param bedNo
- * @return
- */
- @Override
- public ErrorCode bedOpen(Long roomId, String roomName, 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);
- 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());
- List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
-
- // 鏂板宸ヤ綅 浼樺厛闃熷垪
- BedQueueBO bedQueueBO = new BedQueueBO();
- bedQueueBO.setRoomId(roomId);
- bedQueueBO.setRoomName(roomName);
- bedQueueBO.setBedNo(bedNo);
- 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 GlobalErrorCodeConstants.SUCCESS;
- }
-
- @Override
- public ErrorCode bedClose(Long roomId, String bedNo) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- 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.RECALLED.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.setBedOpeningClosed(roomId, bedNo,
- BedStatusEnum.CLOSED, statusList);
- if ( null==updateNum || 0 == updateNum ) {
- log.error("bedClose DB invalid status. " + roomId + " " + bedNo);
- return ROOM_INVALID_STATUS;
- }
-
- mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
- priorityQueue.remove(bedQueueBO);
- return GlobalErrorCodeConstants.SUCCESS;
+ return queueServiceTxFunctions.getMonitorInfo();
}
@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);
}
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
if (null == bedQueueBO) {
log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return error(QUEUE_BED_NOT_EXIST);
@@ -345,110 +270,6 @@
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.setBedDoctorStatus(roomId, bedNo, docId, BedStatusEnum.PAUSE, statusList);
- if ( null==updateNum || 0 == updateNum ) {
- log.error("bedDoctorPause DB invalid status. " + roomId + " " + bedNo);
- return ROOM_INVALID_STATUS;
- }
-
- bedQueueBO.setStatus(BedStatusEnum.PAUSE.getStatus());
- priorityQueue.remove(bedQueueBO);
- return GlobalErrorCodeConstants.SUCCESS;
- }
-
- @Override
- public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- 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 ) {
- log.error("bedDoctorOn DB invalid status. " + roomId + " " + bedNo);
- return ROOM_INVALID_STATUS;
- }
-
- bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- return GlobalErrorCodeConstants.SUCCESS;
- }
-
- @Override
- public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- 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);
- 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;
- }
-
- // 濡傛灉鏄湪 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) {
@@ -467,123 +288,6 @@
return queueMapper.selectPage(pageReqVO);
}
- /**
- * 锛侊紒寮�璇婃湡闂达紝涓嶈兘鎵ц杩欎釜鏂规硶锛屽惁鍒欎細鏈� P0 闂
- * 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
- * 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
- */
- @Override
- public ErrorCode bedReload() {
- priorityQueue.clear();
- mapBedVsQueue.clear();
-
- // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
- queueMapper.clearQueue();
- // 娓呴櫎闈炲綋澶╃殑璇煶鍙彿璁板綍
- callMapper.clearCall();
-
- // 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃
- 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 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
-
- bedQueueBOList.forEach(item -> {
- 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 ( queueReadyMax < queueNum )
- throw new RuntimeException("init: exceed max queue number!");
-
- item.queueNum.set( queueNum );
- 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;
- }
-
- /**
- *
- */
- public void hurryup() {
- if (0 == openingFlag.get())
- return;
-
- // 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
- for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
- while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
- // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.queueRecalledPatient(
- bedQueueBO.getRoomId(),
- bedQueueBO.getRoomName(),
- bedQueueBO.getBedNo(),
- curSeqNum.get() + 1,
- QueueStatusEnum.RECALLED.getStatus(),
- QueueStatusEnum.READY.getStatus());
- if (null == updateNum || 0 == updateNum)
- break;
-
- curSeqNum.getAndIncrement();
-
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedQueueBO.queueNum.incrementAndGet();
-
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡浼樺厛闃熷垪椤哄簭
- priorityQueue.remove(bedQueueBO);
- priorityQueue.offer(bedQueueBO);
- }
- }
-
- // 澶勭悊 鎺掗槦涓� 鎮ｈ��
- while (true) {
- BedQueueBO bedQueueBO = priorityQueue.peek();
- if (null == bedQueueBO)
- return;
-
- int curQueueNum = bedQueueBO.queueNum.get();
- if (curQueueNum > bedQueueBO.maxQueueNum)
- throw new RuntimeException("hurryup: exceed max queue number!");
-
- if (curQueueNum == bedQueueBO.maxQueueNum)
- return;
-
- // 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- Integer updateNum = queueMapper.preemptPatient(
- bedQueueBO.getRoomId(),
- bedQueueBO.getRoomName(),
- bedQueueBO.getBedNo(),
- curSeqNum.get() + 1,
- QueueStatusEnum.WAITING.getStatus(),
- QueueStatusEnum.READY.getStatus());
-
- // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
- if (null == updateNum || 0 == updateNum) {
- return;
- }
-
- curSeqNum.getAndIncrement();
-
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedQueueBO.queueNum.incrementAndGet();
-
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡浼樺厛闃熷垪椤哄簭
- priorityQueue.remove(bedQueueBO);
- priorityQueue.offer(bedQueueBO);
- }
- }
/**
* 棰勭害纭鍚庣殑鎺掗槦
@@ -600,26 +304,7 @@
devRent.setState( DevRentStateEnum.FREE.getState() );
devRentMapper.insert(devRent);
- startHurryUp();
- }
-
- @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 QUEUE_NOT_READY_PATIENT;
- }
-
- // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
- BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
- priorityQueue.remove(bo);
- priorityQueue.offer(bo);
-
- return GlobalErrorCodeConstants.SUCCESS;
+ startHurryUpOneCheckType(Integer.valueOf(queue.getBookCheckType()));
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -664,21 +349,20 @@
return patientStatisticVO;
}
- @Override
- public void setQueueReadyMax(Integer max) {
- queueReadyMax = max;
+ public void initCheckType() {
+ queueServiceTxFunctions.initCheckType( );
}
public void startBiz() {
- if (1 == openingFlag.get())
+ if (1 == queueServiceTxFunctions.getOpeningFlag())
return;
- openingFlag.set(1);
+ queueServiceTxFunctions.setOpeningFlag(1);
startBedReload();
}
public void closeBiz() {
- openingFlag.set(0);
+ queueServiceTxFunctions.setOpeningFlag(0);
startBedReload();
}
@@ -686,21 +370,17 @@
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();
- return updateNum;
- }
- @Override
- public void monitorInfo() {
- log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size()
- + " opening " + openingFlag.get());
+ QueueDO queueDO = queueMapper.getQueueByPatId(patId);
+ startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
+ return updateNum;
}
@Override
--
Gitblit v1.9.3