From c04653a6df7a4f9d3bd593f51ae9a8cd7ee93122 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 15:17:18 +0800
Subject: [PATCH] 患者顺序 处理
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 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 6b7b460..420e1dc 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;
@@ -72,7 +71,7 @@
ConcurrentHashMap<String, BedBO> mapOpeningBed = new ConcurrentHashMap<>();
// 瑁呮満宸ヤ綅..涓嶈繘鍏ュ垎娴侀槦鍒�
- Map<Integer, PriorityBlockingQueue<BedBO>> mapCheckTypeRoutingQueue = new HashMap();
+ ConcurrentHashMap<Integer, PriorityBlockingQueue<BedBO>> mapCheckTypeRoutingQueue = new ConcurrentHashMap<>();
Map<Integer, CheckTypeDO> mapCheckTypeVsReadyMax = null;
@@ -148,7 +147,7 @@
}
mapOpeningBed.remove( Utils.formatRoomBed(roomId, bedNo) );
- removeRoutingQueue(bedBO);
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -169,7 +168,7 @@
}
bedBO.setStatus(BedStatusEnum.DOCTOR_PAUSE.getStatus());
- removeRoutingQueue(bedBO);
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -191,7 +190,7 @@
}
bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addRoutingQueue(bedBO);
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -212,7 +211,7 @@
}
bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addRoutingQueue(bedBO);
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -233,7 +232,7 @@
return ROOM_INVALID_STATUS;
}
- removeRoutingQueue(bedBO);
+ removeBedFromRoutingQueue(bedBO);
bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
return GlobalErrorCodeConstants.SUCCESS;
@@ -261,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;
@@ -271,38 +270,34 @@
firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
queueMapper.updateById( firstReadyQueueItem );
- // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴
+ // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 銆愬�欒瘖涓�戞偅鑰呮暟閲� 鍑忎竴
BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
- bo.readyPatNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
+ 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;
}
@@ -331,7 +326,7 @@
bedBOList.forEach(item -> {
mapOpeningBed.put( Utils.formatRoomBed(item.roomId, item.bedNo), item);
if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) {
- addRoutingQueue(item);
+ addBedToRoutingQueue(item);
}
});
@@ -373,7 +368,7 @@
BedBO bedBO = getBedQueueBO(roomId, bedNo);
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
- while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) {
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
Integer updateNum = queueMapper.queueRecalledPatient(
bedBO.getRoomId(),
@@ -395,11 +390,11 @@
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedBO.readyPatNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
- refreshRoutingQueue(bedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
// 澶勭悊 鎺掗槦涓� 鎮ｈ��
@@ -424,11 +419,11 @@
if (null == bedBO)
return;
- int curQueueNum = bedBO.readyPatNum.get();
- if (curQueueNum > bedBO.maxReadyPatNum)
+ int curQueueNum = bedBO.getReadyPatNum();
+ if (curQueueNum > bedBO.getMaxReadyPatNum())
throw new RuntimeException("hurryupOneCheckType: exceed max queue number!");
- if (curQueueNum == bedBO.maxReadyPatNum)
+ if (curQueueNum == bedBO.getMaxReadyPatNum())
return;
// 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
@@ -456,11 +451,11 @@
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedBO.readyPatNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
- refreshRoutingQueue(bedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
}
@@ -500,7 +495,7 @@
}
private void hurryupOneBedCheckTypeList(BedBO bedBO) {
- while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) {
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
bedBO.getRoomId(),
@@ -526,11 +521,11 @@
curSeqNum.getAndIncrement();
- bedBO.readyPatNum.incrementAndGet();
+ bedBO.readyPatNum++;
}
// 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
- refreshRoutingQueue(bedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
/**
@@ -575,7 +570,7 @@
return ret;
}
- private void addRoutingQueue(BedBO bedBO) {
+ private void addBedToRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
@@ -585,7 +580,7 @@
queueStatusList.add(QueueStatusEnum.READY.getStatus()); //[鍊欒瘖涓璢
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList);
bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) );
- bedBO.setReadyPatNum(new AtomicInteger(queueDOList.size()));
+ bedBO.setReadyPatNum( queueDOList.size() );
Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
@@ -604,7 +599,7 @@
});
}
- private void removeRoutingQueue(BedBO bedBO) {
+ private void removeBedFromRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
@@ -617,7 +612,7 @@
});
}
- private void refreshRoutingQueue(BedBO bedBO) {
+ private void refreshBedPriorityLevelInRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
@@ -625,8 +620,10 @@
Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
- routingQueue.remove(bedBO);
- routingQueue.offer(bedBO);
+ if (null != routingQueue) {
+ routingQueue.remove(bedBO);
+ routingQueue.offer(bedBO);
+ }
});
}
--
Gitblit v1.9.3