From 2f939b4546b7f331e520f1b86b0fa988a1510f62 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 16:01:15 +0800
Subject: [PATCH] 安装阶段 重新标记亲和
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 248 +++++++++++++++++++++++--------------------------
1 files changed, 117 insertions(+), 131 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
index c7f6a90..da8629e 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
@@ -7,7 +7,6 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
@@ -69,10 +68,10 @@
AtomicInteger curSeqNum = new AtomicInteger(0);
// 缁存姢 寮�鏀剧殑宸ヤ綅
- ConcurrentHashMap<String, RoutingBedBO> mapOpeningBed = new ConcurrentHashMap<>();
+ ConcurrentHashMap<String, BedBO> mapOpeningBed = new ConcurrentHashMap<>();
// 瑁呮満宸ヤ綅..涓嶈繘鍏ュ垎娴侀槦鍒�
- Map<Integer, PriorityBlockingQueue<RoutingBedBO>> mapCheckTypeRoutingQueue = new HashMap();
+ ConcurrentHashMap<Integer, PriorityBlockingQueue<BedBO>> mapCheckTypeRoutingQueue = new ConcurrentHashMap<>();
Map<Integer, CheckTypeDO> mapCheckTypeVsReadyMax = null;
@@ -83,8 +82,8 @@
* @return
*/
public ErrorCode bedOpen(Long roomId, String roomName, String bedNo) {
- RoutingBedBO routingBedBO2 = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null != routingBedBO2) {
+ BedBO bedBO2 = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null != bedBO2) {
log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo);
return QUEUE_BED_EXIST;
}
@@ -98,30 +97,24 @@
return ROOM_INVALID_STATUS;
}
- List<Integer> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, queueStatusList);
-
RoomDO roomDO = roomMapper.getRoom(roomId, bedNo);
// 鏂板..宸ヤ綅闃熷垪
- RoutingBedBO routingBedBO = new RoutingBedBO();
- routingBedBO.setRoomId(roomId);
- routingBedBO.setRoomName(roomName);
- routingBedBO.setBedNo(bedNo);
- routingBedBO.setMaxReadyPatNum(getBedReadyMax(roomId, bedNo));
- routingBedBO.setReadyPatNum(new AtomicInteger(queueDOList.size()));
- routingBedBO.setStatus(BedStatusEnum.OPENING.getStatus());
- routingBedBO.setCheckTypes( roomDO.getCheckTypes() );
- routingBedBO.setOpType( roomDO.getOpType() );
- mapOpeningBed.put( Utils.formatRoomBed(roomId, bedNo), routingBedBO);
+ BedBO bedBO = new BedBO();
+ bedBO.setRoomId(roomId);
+ bedBO.setRoomName(roomName);
+ bedBO.setBedNo(bedNo);
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ bedBO.setCheckTypes( roomDO.getCheckTypes() );
+ bedBO.setOpType( roomDO.getOpType() );
+ mapOpeningBed.put( Utils.formatRoomBed(roomId, bedNo), bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedClose(Long roomId, String bedNo) {
- RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == routingBedBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
log.error("bedClose mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -145,7 +138,7 @@
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.OPENING);
statusList.add(BedStatusEnum.DOCTOR_ON);
- statusList.add(BedStatusEnum.PAUSE);
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE);
Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
BedStatusEnum.CLOSED, statusList);
if ( null==updateNum || 0 == updateNum ) {
@@ -154,13 +147,13 @@
}
mapOpeningBed.remove( Utils.formatRoomBed(roomId, bedNo) );
- removeRoutingQueue(routingBedBO);
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
- RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == routingBedBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
log.error("bedDoctorPause mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -168,27 +161,27 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId, BedStatusEnum.PAUSE, statusList);
+ Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId, BedStatusEnum.DOCTOR_PAUSE, statusList);
if ( null==updateNum || 0 == updateNum ) {
log.error("bedDoctorPause DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
}
- routingBedBO.setStatus(BedStatusEnum.PAUSE.getStatus());
- removeRoutingQueue(routingBedBO);
+ bedBO.setStatus(BedStatusEnum.DOCTOR_PAUSE.getStatus());
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
- RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == routingBedBO || !routingBedBO.getStatus().equals(BedStatusEnum.PAUSE.getStatus())) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO || !bedBO.getStatus().equals(BedStatusEnum.DOCTOR_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);
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE);
Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId,
BedStatusEnum.DOCTOR_ON, statusList);
if ( null==updateNum || 0 == updateNum ) {
@@ -196,14 +189,14 @@
return ROOM_INVALID_STATUS;
}
- routingBedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addRoutingQueue(routingBedBO);
+ bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
- RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == routingBedBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -217,14 +210,14 @@
return ROOM_INVALID_STATUS;
}
- routingBedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addRoutingQueue(routingBedBO);
+ bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
- RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
- if (null == routingBedBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
+ if (null == bedBO) {
log.error("bedDoctorOff mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -232,16 +225,16 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- statusList.add(BedStatusEnum.PAUSE);
+ statusList.add(BedStatusEnum.DOCTOR_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;
}
- removeRoutingQueue(routingBedBO);
+ removeBedFromRoutingQueue(bedBO);
- routingBedBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -267,7 +260,7 @@
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
- QueueDO firstReadyQueueItem = queueMapper.getFirstItemByBedAndStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
+ QueueDO firstReadyQueueItem = queueMapper.getBedFirstQueueItemByStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
// 璇ュ伐浣� 娌℃湁 [鍊欒瘖涓腑] 浜哄憳
if (null == firstReadyQueueItem) {
return QUEUE_NOT_READY_PATIENT;
@@ -277,38 +270,34 @@
firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
queueMapper.updateById( firstReadyQueueItem );
- // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴
- RoutingBedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
- bo.readyPatNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
+ // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 銆愬�欒瘖涓�戞偅鑰呮暟閲� 鍑忎竴
+ BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
+ bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
- refreshRoutingQueue(bo);
+ refreshBedPriorityLevelInRoutingQueue(bo);
return GlobalErrorCodeConstants.SUCCESS;
}
// 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ [宸插彫鍥�-瀹夎] 鐨勪汉 璁剧疆涓� [瀹夎涓璢
- QueueDO firstItem = queueMapper.getFirstItemByRoomAndStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
+ QueueDO firstItem = queueMapper.getRoomFirstQueueItemByStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
// 璇ュ伐浣� 娌℃湁 [宸查鐢╙ | [宸插彫鍥�-瀹夎] 浜哄憳
if (null == firstItem) {
return QUEUE_NOT_READY_PATIENT;
}
firstItem.setStatus( QueueStatusEnum.INSTALLING.getStatus() );
- firstItem.setBedNo( bedNo );
+ firstItem.setBedNo( bedNo ); // 杞埌 瀹夎宸ヤ綅
queueMapper.updateById( firstItem );
- // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫: 鍙樹负銆愬畨瑁呬腑銆戝悗 鎷� 鍏朵粬妫�鏌ラ」鏉ヤ翰鍜�
CheckTypeDO checkTypeDO = getCheckTypeItem( firstItem.getBookCheckType() );
if (checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenSomeOneEntryInstalling(firstItem.getPatId(), roomId, bedNo, checkTypeDO.getAffinityCheckTypes() );
}
- // 瑁呮満宸ヤ綅 涓嶈繘鍏� 鍒嗘祦闃熷垪
- // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� [宸查鐢╙浜虹殑鏁伴噺 鍑忎竴
- //BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
- //bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
- //refreshRoutingQueue(bo);
+ // 瑁呮満宸ヤ綅 涓嶅弬涓庡垎娴�
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -330,26 +319,14 @@
List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
bedStatusEnumList.add(BedStatusEnum.OPENING);
bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
- bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_PAUSE);
List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
- List<RoutingBedBO> routingBedBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, RoutingBedBO.class)).toList();
+ List<BedBO> bedBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedBO.class)).toList();
- // 浠嶥B 鑾峰彇 闃熷垪涓� 銆愬�欒瘖涓�戜汉鍛樼粺璁� 鍒楄〃
- List<Integer> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
-
- routingBedBOList.forEach(item -> {
- item.setMaxReadyPatNum( getBedReadyMax(item.roomId, item.bedNo) );
- 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 ( item.getMaxReadyPatNum() < queueNum )
- throw new RuntimeException("init: exceed max queue number!");
-
- item.setReadyPatNum( new AtomicInteger(queueNum) );
+ bedBOList.forEach(item -> {
mapOpeningBed.put( Utils.formatRoomBed(item.roomId, item.bedNo), item);
if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) {
- addRoutingQueue(item);
+ addBedToRoutingQueue(item);
}
});
@@ -364,7 +341,7 @@
// 韪㈠嚭鍦ㄥ骇鐨勫尰鐢�
List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
- bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_PAUSE);
List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<Long> userIdList = roomDOList.stream().map(roomDO -> roomDO.getDocId()).toList();
oAuth2TokenApi.tick(userIdList);
@@ -388,15 +365,15 @@
if (0 == openingFlag.get())
return;
- RoutingBedBO routingBedBO = getBedQueueBO(roomId, bedNo);
+ BedBO bedBO = getBedQueueBO(roomId, bedNo);
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
- while (routingBedBO.readyPatNum.get() < routingBedBO.maxReadyPatNum) {
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
Integer updateNum = queueMapper.queueRecalledPatient(
- routingBedBO.getRoomId(),
- routingBedBO.getRoomName(),
- routingBedBO.getBedNo(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
curSeqNum.get() + 1, // 杩囧彿鍥炴潵锛屾帓鍒板綋鍓嶇殑涓嬩竴浣�
QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒�
QueueStatusEnum.READY.getStatus());
@@ -413,15 +390,15 @@
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- routingBedBO.readyPatNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
- refreshRoutingQueue(routingBedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
// 澶勭悊 鎺掗槦涓� 鎮ｈ��
- hurryupOneBedCheckTypeList(routingBedBO);
+ hurryupOneBedCheckTypeList(bedBO);
}
/**
@@ -433,31 +410,31 @@
*/
public void hurryupOneCheckType(Integer checkType) {
- PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
if (null == routingQueue)
return;
while (true) {
- RoutingBedBO routingBedBO = routingQueue.peek();
- if (null == routingBedBO)
+ BedBO bedBO = routingQueue.peek();
+ if (null == bedBO)
return;
- int curQueueNum = routingBedBO.readyPatNum.get();
- if (curQueueNum > routingBedBO.maxReadyPatNum)
+ int curQueueNum = bedBO.getReadyPatNum();
+ if (curQueueNum > bedBO.getMaxReadyPatNum())
throw new RuntimeException("hurryupOneCheckType: exceed max queue number!");
- if (curQueueNum == routingBedBO.maxReadyPatNum)
+ if (curQueueNum == bedBO.getMaxReadyPatNum())
return;
// 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
- routingBedBO.getRoomId(),
- routingBedBO.getRoomName(),
- routingBedBO.getBedNo(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
curSeqNum.get() + 1,
QueueStatusEnum.WAITING.getStatus(),
QueueStatusEnum.READY.getStatus(),
- routingBedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType
+ bedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType
// 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
if (null == updateNum || 0 == updateNum) {
@@ -474,11 +451,11 @@
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- routingBedBO.readyPatNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
- refreshRoutingQueue(routingBedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
}
@@ -499,7 +476,7 @@
return mapCheckTypeVsReadyMax.get( checkType );
}
- public RoutingBedBO getBedQueueBO(Long roomId, String bedNo) {
+ public BedBO getBedQueueBO(Long roomId, String bedNo) {
return mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
}
@@ -517,17 +494,17 @@
log.info(" opening " + openingFlag.get() + " " + monitorInfoVO.getOpeningBedNum() + " " + monitorInfoVO.getDocBedNum() + " " + monitorInfoVO.getCheckTypeBedInfo().toString() );
}
- private void hurryupOneBedCheckTypeList(RoutingBedBO routingBedBO) {
- while (routingBedBO.readyPatNum.get() < routingBedBO.maxReadyPatNum) {
+ private void hurryupOneBedCheckTypeList(BedBO bedBO) {
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
- routingBedBO.getRoomId(),
- routingBedBO.getRoomName(),
- routingBedBO.getBedNo(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
curSeqNum.get() + 1,
QueueStatusEnum.WAITING.getStatus(),
QueueStatusEnum.READY.getStatus(),
- routingBedBO.checkTypes);
+ bedBO.checkTypes);
// 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
if (null == updateNum || 0 == updateNum) {
@@ -544,11 +521,11 @@
curSeqNum.getAndIncrement();
- routingBedBO.readyPatNum.incrementAndGet();
+ bedBO.readyPatNum++;
}
// 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
- refreshRoutingQueue(routingBedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
/**
@@ -582,63 +559,71 @@
}
}
- private Integer getBedReadyMax(Long roomId, String bedNo) {
- RoomDO roomDO = roomMapper.getRoom(roomId, bedNo);
- Integer[] checkTypes = roomDO.getCheckTypes();
- Integer ret = 0;
- for (int i=0; i<checkTypes.length; i++) {
- CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkTypes[i]);
+ private Integer getBedReadyMax(BedBO bedBO) {
+ Integer[] checkTypes = bedBO.getCheckTypes();
+ int ret = 0;
+ for (Integer checkType : checkTypes) {
+ CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkType);
Integer tmp = checkTypeDO.getReadyNum();
ret = ret < tmp ? tmp : ret; //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊�
}
return ret;
}
- private void addRoutingQueue(RoutingBedBO routingBedBO) {
+ private void addBedToRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
- if (BedOpTypeEnum.OP_INSTALL.getOpType() == routingBedBO.getOpType())
+ if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
- Integer[] checkTypes = routingBedBO.getCheckTypes();
+ // 鍚屾DB, 璁剧疆宸ヤ綅鐨勫垎娴佹帶鍒朵俊鎭�
+ List<Integer> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.READY.getStatus()); //[鍊欒瘖涓璢
+ List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList);
+ bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) );
+ bedBO.setReadyPatNum( queueDOList.size() );
+
+ Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkType);
- PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
if (null == routingQueue) {
- routingQueue = new PriorityBlockingQueue<RoutingBedBO>();
+ routingQueue = new PriorityBlockingQueue<BedBO>();
mapCheckTypeRoutingQueue.put( checkType, routingQueue );
}
- if (!routingQueue.contains(routingBedBO)) {
- routingQueue.offer(routingBedBO);
+ if (!routingQueue.contains(bedBO)) {
+ routingQueue.offer(bedBO);
} else {
- log.error("bedDoctorResume routingQueue still exist!. " + routingBedBO.getRoomId() + " " + routingBedBO.getBedNo());
+ log.error("bedDoctorResume routingQueue still exist!. " + bedBO.getRoomId() + " " + bedBO.getBedNo());
}
});
}
- private void removeRoutingQueue(RoutingBedBO routingBedBO) {
+ private void removeBedFromRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
- if (BedOpTypeEnum.OP_INSTALL.getOpType() == routingBedBO.getOpType())
+ if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
- Integer[] checkTypes = routingBedBO.getCheckTypes();
+ Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
- PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
if (null != routingQueue)
- routingQueue.remove(routingBedBO);
+ routingQueue.remove(bedBO);
});
}
- private void refreshRoutingQueue(RoutingBedBO routingBedBO) {
+ private void refreshBedPriorityLevelInRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
- if (BedOpTypeEnum.OP_INSTALL.getOpType() == routingBedBO.getOpType())
+ if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
- Integer[] checkTypes = routingBedBO.getCheckTypes();
+ Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
- PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
- routingQueue.remove(routingBedBO);
- routingQueue.offer(routingBedBO);
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ if (null != routingQueue) {
+ routingQueue.remove(bedBO);
+ routingQueue.offer(bedBO);
+ }
});
}
@@ -651,6 +636,7 @@
for (int i = 0; i < affinityItems.size(); i++) {
QueueDO queueItem = affinityItems.get(i);
queueItem.setStatus(QueueStatusEnum.AFFINITY_INSTALL.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+ queueItem.setAffinityItem(1);
queueItem.setRoomId(roomId_operator);
queueItem.setBedNo(bedNo_operator); // 璺熼殢鍒� 瑁呮満 宸ヤ綅
queueMapper.updateById(queueItem);
@@ -679,7 +665,7 @@
mapOpeningInstallBedStatInfo.put(checkType, mapOpeningInstallBedStatInfo.get(checkType) + 1 );
if (bedQueueBO.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus() ||
- bedQueueBO.getStatus() == BedStatusEnum.PAUSE.getStatus()) {
+ bedQueueBO.getStatus() == BedStatusEnum.DOCTOR_PAUSE.getStatus()) {
if (bedQueueBO.opType == 0 || bedQueueBO.opType == 1)
mapDocCheckBedStatInfo.put(checkType, mapDocCheckBedStatInfo.get(checkType) + 1);
else
@@ -689,7 +675,7 @@
});
// 鎺ユ敹..鎺掗槦涓偅鑰�..鐨勫垎娴侀槦鍒�
- HashSet<RoutingBedBO> hashSetOperatingBedQueue = new HashSet<>();
+ HashSet<BedBO> hashSetOperatingBedQueue = new HashSet<>();
mapCheckTypeRoutingQueue.values().forEach(routingQueue->{
routingQueue.stream().forEach(bedQueueBO -> hashSetOperatingBedQueue.add(bedQueueBO));
});
@@ -708,7 +694,7 @@
monitorInfoVO.setOpeningBedNum(mapOpeningBed.size());
monitorInfoVO.setDocBedNum((int) mapOpeningBed.values().stream().filter(item ->
item.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus() ||
- item.getStatus() == BedStatusEnum.PAUSE.getStatus())
+ item.getStatus() == BedStatusEnum.DOCTOR_PAUSE.getStatus())
.count());
monitorInfoVO.setRoutingBedNum( hashSetOperatingBedQueue.size() );
monitorInfoVO.setMapBedVsQueue(mapOpeningBed);
--
Gitblit v1.9.3