From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 604 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 396 insertions(+), 208 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 166034f..7acf662 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,13 +7,13 @@
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;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
+import cn.lihu.jh.module.ecg.enums.BedOpTypeEnum;
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;
@@ -67,14 +67,12 @@
AtomicInteger openingFlag = new AtomicInteger(0);
AtomicInteger curSeqNum = new AtomicInteger(0);
- ConcurrentHashMap<String, BedQueueBO > mapBedVsQueue = new ConcurrentHashMap<>();
+ // 缁存姢 寮�鏀剧殑宸ヤ綅
+ ConcurrentHashMap<String, BedBO> mapOpeningBed = new ConcurrentHashMap<>();
- // 瑁呮満宸ヤ綅..涓嶈繘鍏ヤ紭鍏堥槦鍒�
- Map<Integer, PriorityBlockingQueue<BedQueueBO>> mapCheckTypePriorityQueue = new HashMap();
-
- // 鍩轰簬绫诲瀷鐨�, 瑁呮満鍑嗗鐨勪紭鍏堥槦鍒�
- // Map<Integer, PriorityBlockingQueue<BedQueueBO>> mapReadyPriorityQueue = new HashMap();
-
+ // 瑁呮満宸ヤ綅..涓嶈繘鍏ュ垎娴侀槦鍒�
+ ConcurrentHashMap<Integer, PriorityBlockingQueue<BedBO>> mapCheckTypeRoutingQueue = new ConcurrentHashMap<>();
+
Map<Integer, CheckTypeDO> mapCheckTypeVsReadyMax = null;
/**
@@ -84,8 +82,8 @@
* @return
*/
public ErrorCode bedOpen(Long roomId, String roomName, String bedNo) {
- BedQueueBO bedQueueBO2 = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null != bedQueueBO2) {
+ BedBO bedBO2 = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null != bedBO2) {
log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo);
return QUEUE_BED_EXIST;
}
@@ -99,41 +97,39 @@
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);
// 鏂板..宸ヤ綅闃熷垪
- BedQueueBO bedQueueBO = new BedQueueBO();
- bedQueueBO.setRoomId(roomId);
- bedQueueBO.setRoomName(roomName);
- bedQueueBO.setBedNo(bedNo);
- bedQueueBO.setMaxQueueNum(getBedReadyMax(roomId, bedNo));
- bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
- bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
- bedQueueBO.setCheckTypes( roomDO.getCheckTypes() );
- bedQueueBO.setOpType( roomDO.getOpType() );
- mapBedVsQueue.put( Utils.formatRoomBed(roomId, bedNo), bedQueueBO);
+ 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) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == bedQueueBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
log.error("bedClose mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
- // 闄や簡鍒ゆ柇 鍑嗗鍊欒瘖涓� 鐨勪汉鏁帮紝杩橀渶瑕� 鍒ゆ柇 杩囧彿鐨勪汉鏁�
- //if (bedQueueBO.getQueueNum().get() >0)
- // return QUEUE_HAVE_PATIENT;
+ // 妫�鏌ユ槸鍚﹁繕鏈夋偅鑰呴渶瑕佸鐞�
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
+ queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, queueStatusList);
if (queueDOList.size() > 0)
return QUEUE_HAVE_PATIENT;
@@ -142,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 ) {
@@ -150,14 +146,14 @@
return ROOM_INVALID_STATUS;
}
- mapBedVsQueue.remove( Utils.formatRoomBed(roomId, bedNo) );
- removePriorityQueue(bedQueueBO);
+ mapOpeningBed.remove( Utils.formatRoomBed(roomId, bedNo) );
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == bedQueueBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
log.error("bedDoctorPause mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -165,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;
}
- bedQueueBO.setStatus(BedStatusEnum.PAUSE.getStatus());
- removePriorityQueue(bedQueueBO);
+ bedBO.setStatus(BedStatusEnum.DOCTOR_PAUSE.getStatus());
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == bedQueueBO || !bedQueueBO.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 ) {
@@ -193,14 +189,75 @@
return ROOM_INVALID_STATUS;
}
- bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addPriorityQueue(bedQueueBO);
+ bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
+ // ==================== 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏� ====================
+
+ /**
+ * 璁剧疆銆屽仠姝㈠�欒瘖銆嶅紑鍏炽��
+ * <p>
+ * {@code stop=true}锛氳宸ヤ綅**涓嶅啀鏂板**鍊欒瘖鎮ｈ�咃紙绉诲嚭鍒嗘祦闃熷垪锛夛紝
+ * 浣�**宸叉湁鍊欒瘖鎮ｈ�呬粛鍙甯稿彨鍙�**锛坽@code nextPatient} 涓嶆鏌ユ寮�鍏筹級銆�
+ * <p>
+ * {@code stop=false}锛氭仮澶嶆甯革紝閲嶆柊鍔犲叆鍒嗘祦闃熷垪寮�濮嬫帴鏀舵偅鑰�
+ * 锛堝墠鎻愭槸宸ヤ綅鐘舵�佷负"鍖荤敓鍦ㄥ骇"锛屼笌 {@code bedReload} 鐨勫垽瀹氫竴鑷达級銆�
+ * <p>
+ * 鐘舵�佸啓鍏� {@code clinic_room.stop_ready}锛屼互鍦� {@code bedReload} 鍚庝繚鎸併��
+ *
+ * @return 鎴愬姛杩斿洖 SUCCESS锛涘伐浣嶄笉瀛樺湪杩斿洖 {@link #QUEUE_BED_NOT_EXIST}
+ */
+ public ErrorCode setStopReady(Long roomId, String bedNo, boolean stop) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
+ log.error("[setStopReady] 宸ヤ綅涓嶅瓨鍦�. roomId={} bedNo={}", roomId, bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ // 鍏堣惤搴擄紙澶辫触鍒欎笉鏀瑰唴瀛橈紝閬垮厤鐘舵�佷笉涓�鑷达級
+ //
+ // 銆愰儴缃蹭繚鎶ゃ�戣嫢鏁版嵁搴撳皻鏈墽琛屽崌绾ц剼鏈紙缂� clinic_room.stop_ready 鍒楋級锛�
+ // roomMapper.setBedStopReady(...) 浼氬湪 Mapper 灞傜洿鎺ユ姏 SQL 寮傚父
+ // 锛園Update 娉ㄨВ鏂规硶娌℃湁杩斿洖鍊煎彲鍒ゆ柇锛屽紓甯哥洿鎺ュ啋娉★級銆�
+ // 杩欓噷鏄惧紡鎹曡幏骞惰浆鎴愭槑纭殑涓氬姟閿欒鐮侊紝閬垮厤鎶婂師濮� SQL 閿欒鏆撮湶缁欏墠绔紝
+ // 渚夸簬鐜板満涓�鐪肩湅鍑烘槸"閮ㄧ讲閬楁紡"鑰屼笉鏄�"鍔熻兘鍧忎簡"銆�
+ Integer updateNum;
+ try {
+ updateNum = roomMapper.setBedStopReady(roomId, bedNo, stop ? 1 : 0);
+ } catch (Exception e) {
+ log.error("[setStopReady] 鍐欏簱澶辫触锛岃纭宸叉墽琛� _prep/11_闇�姹傚崌绾姹囨�籗QL.sql"
+ + "锛坈linic_room.stop_ready锛�. roomId={} bedNo={}", roomId, bedNo, e);
+ return QUEUE_STOP_READY_NOT_CONFIGURED;
+ }
+ if (null == updateNum || 0 == updateNum) {
+ // 宸ヤ綅鍙兘灏氭湭鍦� clinic_room 鐧昏锛屼粎鍛婅浣嗕粛鍏佽鏀瑰唴瀛橈紝
+ // 浠ュ厤鍥� DB 璁板綍缂哄け瀵艰嚧鍖荤敓瀹屽叏鏃犳硶浣跨敤璇ュ姛鑳姐��
+ log.warn("[setStopReady] DB 鏈洿鏂板埌琛岋紝浠呮洿鏂板唴瀛�. roomId={} bedNo={} stop={}", roomId, bedNo, stop);
+ }
+
+ bedBO.setStopReady(stop);
+
+ // 鍚屾鍒嗘祦闃熷垪锛氬仠姝� 鈫� 绉诲嚭锛涙仮澶� 鈫� 鍔犲叆锛堜粎鍦ㄥ尰鐢熷湪搴ф椂锛�
+ if (stop) {
+ removeBedFromRoutingQueue(bedBO);
+ } else if (BedStatusEnum.DOCTOR_ON.getStatus().equals(bedBO.getStatus())) {
+ addBedToRoutingQueue(bedBO);
+ }
+ log.info("[setStopReady] roomId={} bedNo={} stopReady={}", roomId, bedNo, stop);
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /** 鏌ヨ褰撳墠銆屽仠姝㈠�欒瘖銆嶇姸鎬侊紙宸ヤ綅涓嶅瓨鍦ㄨ繑鍥� null锛� */
+ public Boolean getStopReady(Long roomId, String bedNo) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ return null == bedBO ? null : Boolean.TRUE.equals(bedBO.getStopReady());
+ }
+
public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
- if (null == bedQueueBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if (null == bedBO) {
log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -214,14 +271,14 @@
return ROOM_INVALID_STATUS;
}
- bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addPriorityQueue(bedQueueBO);
+ bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
- if (null == bedQueueBO) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
+ if (null == bedBO) {
log.error("bedDoctorOff mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
@@ -229,43 +286,43 @@
// 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;
}
- removePriorityQueue(bedQueueBO);
+ removeBedFromRoutingQueue(bedBO);
- bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
return GlobalErrorCodeConstants.SUCCESS;
}
/* 2024.11.11
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶婅宸ヤ綅.搴忓彿鏈�灏忕殑 [灏辫瘖鍑嗗涓璢 鐨勪汉 璁剧疆涓� [灏辫瘖涓璢 (鎴栭鐢ㄤ腑)
+ // 浠� DB 鎶婅宸ヤ綅.搴忓彿鏈�灏忕殑 [鍊欒瘖涓腑] 鐨勪汉 璁剧疆涓� [灏辫瘖涓璢 (鎴栭鐢ㄤ腑)
Integer updateNum = queueMapper.updateBedQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
- // 璇ュ伐浣� 娌℃湁 [灏辫瘖鍑嗗涓璢 浜哄憳
+ // 璇ュ伐浣� 娌℃湁 [鍊欒瘖涓腑] 浜哄憳
if (null == updateNum || 0 == updateNum) {
return QUEUE_NOT_READY_PATIENT;
}
- // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
+ // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴
BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
- refreshPriorityQueue(bo);
+ refreshRoutingQueue(bo);
return GlobalErrorCodeConstants.SUCCESS;
}
*/
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
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;
}
@@ -274,53 +331,45 @@
firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
queueMapper.updateById( firstReadyQueueItem );
- // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
- CheckTypeDO checkTypeDO = getCheckTypeItem( firstReadyQueueItem.getBookCheckType() );
- if (checkTypeDO.getAffinityCheckTypes().length > 0) {
- List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstReadyQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
- if (!affinityItems.isEmpty()) {
- QueueDO tmpQueueDO = affinityItems.get(0);
- tmpQueueDO.setStatus( QueueStatusEnum.READY.getStatus() );
- queueMapper.updateById( tmpQueueDO );
- return GlobalErrorCodeConstants.SUCCESS; // 鍑嗗涓� 鏁伴噺娌℃湁鍙樺寲锛屾晠鐩存帴杩斿洖
- }
- }
+ // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 銆愬�欒瘖涓�戞偅鑰呮暟閲� 鍑忎竴
+ BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
+ bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
- // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
- BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
- bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
-
- refreshPriorityQueue(bo);
+ refreshBedPriorityLevelInRoutingQueue(bo);
return GlobalErrorCodeConstants.SUCCESS;
}
// 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ 鐨勪汉 璁剧疆涓� [瀹夎涓璢
- Integer updateNum = queueMapper.preemptToBeInstalledPatient(roomId, bedNo,
- List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()),
- QueueStatusEnum.INSTALLING.getStatus());
- // 璇ュ伐浣� 娌℃湁 [宸查鐢╙ 浜哄憳
- if (null == updateNum || 0 == updateNum) {
+ // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ [宸插彫鍥�-瀹夎] 鐨勪汉 璁剧疆涓� [瀹夎涓璢
+ QueueDO firstItem = queueMapper.getRoomFirstQueueItemByStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
+ // 璇ュ伐浣� 娌℃湁 [宸查鐢╙ | [宸插彫鍥�-瀹夎] 浜哄憳
+ if (null == firstItem) {
return QUEUE_NOT_READY_PATIENT;
}
- // 瑁呮満宸ヤ綅 鏃犱紭鍏堥槦鍒�
- // 浼樺厛闃熷垪涓� 璇ュ伐浣� [宸查鐢╙浜虹殑鏁伴噺 鍑忎竴
- //BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
- //bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
- //refreshPriorityQueue(bo);
+ firstItem.setStatus( QueueStatusEnum.INSTALLING.getStatus() );
+ firstItem.setBedNo( bedNo ); // 杞埌 瀹夎宸ヤ綅
+ queueMapper.updateById( firstItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫: 鍙樹负銆愬畨瑁呬腑銆戝悗 鎷� 鍏朵粬妫�鏌ラ」鏉ヤ翰鍜�
+ CheckTypeDO checkTypeDO = getCheckTypeItem( firstItem.getBookCheckType() );
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenSomeOneEntryInstalling(firstItem.getPatId(), roomId, bedNo, checkTypeDO.getAffinityCheckTypes() );
+ }
+
+ // 瑁呮満宸ヤ綅 涓嶅弬涓庡垎娴�
return GlobalErrorCodeConstants.SUCCESS;
}
/**
- * 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅鍒嗘祦闃熷垪
* 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
*/
public ErrorCode bedReload() {
- mapCheckTypePriorityQueue.clear();
- mapBedVsQueue.clear();
+ mapCheckTypeRoutingQueue.clear();
+ mapOpeningBed.clear();
// 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
queueMapper.clearQueue();
@@ -331,26 +380,19 @@
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<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.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);
-
- bedQueueBOList.forEach(item -> {
- item.maxQueueNum = 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.maxQueueNum < queueNum )
- throw new RuntimeException("init: exceed max queue number!");
-
- item.queueNum.set( queueNum );
- mapBedVsQueue.put( Utils.formatRoomBed(item.roomId, item.bedNo), item);
- if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) {
- addPriorityQueue(item);
+ bedBOList.forEach(item -> {
+ mapOpeningBed.put( Utils.formatRoomBed(item.roomId, item.bedNo), item);
+ // 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅涓嶅姞鍏ュ垎娴侀槦鍒� 鈥斺�� 涓庡尰鐢熷湪搴�(status=DOCTOR_ON)鍚屾牱鍒ゅ畾锛�
+ // 鍚﹀垯姣忔 bedReload锛堝紑璇�/閲嶅惎/璇婂閲嶇疆锛夊悗寮�鍏充細澶辨晥銆佸張寮�濮嬫敹鐥呬汉銆�
+ // 娉ㄦ剰锛歴topReady 浠呴樆姝�**鏂板**鍊欒瘖鎮ｈ�咃紝宸叉湁鍊欒瘖鎮ｈ�呬粛鍙甯稿彨鍙�
+ // 锛坣extPatient 涓嶆鏌ヨ寮�鍏筹級銆�
+ if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()
+ && !Boolean.TRUE.equals(item.getStopReady())) {
+ addBedToRoutingQueue(item);
}
});
@@ -361,16 +403,16 @@
}
public void resetRoom(Boolean needCloseBed) {
- // 韪㈠嚭鍦ㄥ骇鐨勫尰鐢�
- List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
- bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
- bedStatusEnumList.add(BedStatusEnum.PAUSE);
- List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
- List<Long> userIdList = roomDOList.stream().map(roomDO -> roomDO.getDocId()).toList();
- oAuth2TokenApi.tick(userIdList);
-
- // 鍏抽棴鎵�鏈夊伐浣�
if (needCloseBed) {
+ // 韪㈠嚭鍦ㄥ骇鐨勫尰鐢�
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_PAUSE);
+ List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
+ List<Long> userIdList = roomDOList.stream().map(roomDO -> roomDO.getDocId()).toList();
+ oAuth2TokenApi.tick(userIdList);
+
+ // 鎵�鏈夊伐浣嶇姸鎬� => 鍏抽棴
Integer ret = roomMapper.resetRoom(BedStatusEnum.CLOSED.getStatus());
}
}
@@ -379,7 +421,7 @@
if (0 == openingFlag.get())
return;
- mapBedVsQueue.values().forEach(bedQueueBO -> hurryupOneBed(bedQueueBO.roomId, bedQueueBO.bedNo));
+ mapOpeningBed.values().forEach(bedQueueBO -> hurryupOneBed(bedQueueBO.roomId, bedQueueBO.bedNo));
}
/**
@@ -389,92 +431,120 @@
if (0 == openingFlag.get())
return;
- BedQueueBO bedQueueBO = getBedQueueBO(roomId, bedNo);
+ BedBO bedBO = getBedQueueBO(roomId, bedNo);
+
+ // 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶆椂涓嶅啀鎶娿�愬凡鍙洖銆戞偅鑰呮斁鍏ュ�欒瘖鍖恒��
+ // 娉ㄦ剰锛氳繖**涓嶅奖鍝�**宸叉湁鍊欒瘖鎮ｈ�呰姝ｅ父鍙彿锛坣extPatient 涓嶆鏌ユ湰寮�鍏筹級锛�
+ // 涔熶笉褰卞搷鍖荤敓瀵瑰叿浣撴偅鑰呯殑"鍙洖"鎿嶄綔鏈韩锛堝彧褰卞搷鍏惰嚜鍔ㄨ繘鍏ュ�欒瘖鐨勮ˉ浣嶏級銆�
+ boolean stopReady = Boolean.TRUE.equals(bedBO.getStopReady());
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
- while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
+ while (!stopReady && bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
Integer updateNum = queueMapper.queueRecalledPatient(
- bedQueueBO.getRoomId(),
- bedQueueBO.getRoomName(),
- bedQueueBO.getBedNo(),
- curSeqNum.get() + 1,
- QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 娌℃湁浼樺厛闃熷垪
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
+ curSeqNum.get() + 1, // 杩囧彿鍥炴潵锛屾帓鍒板綋鍓嶇殑涓嬩竴浣�
+ QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒�
QueueStatusEnum.READY.getStatus());
if (null == updateNum || 0 == updateNum)
break;
+ // [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ QueueDO recalledQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+
+ CheckTypeDO checkTypeDO = getCheckTypeItem( recalledQueueItem.getBookCheckType() );
+ if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenRecalled(recalledQueueItem, checkTypeDO.getAffinityCheckTypes());
+ }
+
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedQueueBO.queueNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡浼樺厛闃熷垪椤哄簭
- refreshPriorityQueue(bedQueueBO);
+ // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
// 澶勭悊 鎺掗槦涓� 鎮ｈ��
- Integer[] checkTypes = bedQueueBO.getCheckTypes();
- Arrays.stream(checkTypes).forEach(checkType -> hurryupOneCheckType(checkType));
+ hurryupOneBedCheckTypeList(bedBO);
}
+ /**
+ * 涓�涓伐浣嶅彲浠ユ敮鎸佸涓鏌ラ」鐩紝鎵�浠ラ渶瑕佷繚璇佸涓鏌ラ」鐩殑灏辫瘖鏃堕棿鍏堝悗椤哄簭
+ * 鎸夌収涓�涓鏌ラ」鐩潵澶勭悊锛屽氨涓嶈兘淇濊瘉鍚屼竴涓伐浣嶇殑澶氫釜妫�鏌ラ」鐩殑灏辫瘖鏃堕棿鐨勫厛鍚庨『搴�
+ * 鎵�浠ュ疄鐜伴�昏緫鏄� 璁╂敮鎸佽妫�鏌ラ」鐩殑鎵�鏈夊伐浣嶅幓鎶㈠崰 銆愭帓闃熶腑銆戙�愬伐浣嶆敮鎸佺殑妫�鏌ラ」鐩�戠殑鎮ｈ��
+ * 瀹為檯鎶㈠崰鐨勬湭蹇呮槸 鍙傛暟涓殑妫�鏌ラ」鐩殑鎮ｈ�咃紝鍙兘鏄叾浠栨鏌ラ」鐩殑鎮ｈ��
+ * @param checkType
+ */
public void hurryupOneCheckType(Integer checkType) {
- PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypePriorityQueue.get(checkType);
- if (null == priorityQueue)
+ // 銆愪慨澶嶆棦鏈夌己闄枫�戣ˉ涓婂紑璇婇棬闂搞�傚師瀹炵幇**鍞嫭杩欓噷婕忎簡** openingFlag 妫�鏌�
+ // 锛坔urryupAllBed 涓� hurryupOneBed 閮芥湁锛夛紝瀵艰嚧鎵嬪姩"闂瘖"鍚庯紝
+ // 鍙鏈変汉棰勭害纭 / 鍔犳�ワ紝鎮ｈ�呬粛浼氳鎺ㄨ繘鍊欒瘖鍖恒��
+ if (0 == openingFlag.get())
+ return;
+
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ if (null == routingQueue)
return;
while (true) {
- BedQueueBO bedQueueBO = priorityQueue.peek();
- if (null == bedQueueBO)
+ BedBO bedBO = routingQueue.peek();
+ if (null == bedBO)
return;
- int curQueueNum = bedQueueBO.queueNum.get();
- if (curQueueNum > bedQueueBO.maxQueueNum)
+ // 銆愰渶姹�3銆戣烦杩囧浜庛�屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅銆�
+ // 涓嶈兘鐩存帴 return 鈥斺�� 璇ラ槦鍒楁寜 readyPatNum 鍗囧簭 peek锛�
+ // 鐩存帴 return 浼氳鍏朵綑宸ヤ綅涔熸敹涓嶅埌鎮ｈ�咃紙楗挎锛夈��
+ // 杩欓噷 poll 鍑烘潵鍚庤嫢鍛戒腑鍋滄鎬侊紝浠呭皢鍏朵粠闃熷垪绉婚櫎锛堜笉鍐� offer 鍥炲幓锛夛紝
+ // 鐒跺悗 continue 澶勭悊涓嬩竴涓伐浣嶃��
+ if (Boolean.TRUE.equals(bedBO.getStopReady())) {
+ routingQueue.poll();
+ log.info("[hurryupOneCheckType] 宸ヤ綅[鍋滄鍊欒瘖]锛岀Щ鍑哄垎娴侀槦鍒�. roomId={} bedNo={}",
+ bedBO.getRoomId(), bedBO.getBedNo());
+ continue;
+ }
+
+ int curQueueNum = bedBO.getReadyPatNum();
+ if (curQueueNum > bedBO.getMaxReadyPatNum())
throw new RuntimeException("hurryupOneCheckType: exceed max queue number!");
- if (curQueueNum == bedQueueBO.maxQueueNum)
+ if (curQueueNum == bedBO.getMaxReadyPatNum())
return;
// 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- Integer updateNum = queueMapper.preemptWaitingPatient(
- bedQueueBO.getRoomId(),
- bedQueueBO.getRoomName(),
- bedQueueBO.getBedNo(),
+ Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
curSeqNum.get() + 1,
QueueStatusEnum.WAITING.getStatus(),
QueueStatusEnum.READY.getStatus(),
- checkType);
+ bedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType
// 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
if (null == updateNum || 0 == updateNum) {
return;
}
+ QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );
+
// 鎶㈠埌鎺掗槦鎮ｈ�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
- QueueDO queueDO = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
- CheckTypeDO checkTypeDO = getCheckTypeItem( queueDO.getBookCheckType() );
if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
- List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(queueDO.getPatId(),
- checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.WAITING.getStatus());
- for (int i = 0; i < affinityItems.size(); i++) {
- QueueDO queueItem = affinityItems.get(i);
- queueItem.setStatus(QueueStatusEnum.AFFINITY_WAITING.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
- queueItem.setRoomId(queueItem.getRoomId());
- queueItem.setRoomName(queueItem.getRoomName());
- queueItem.setBedNo(queueItem.getBedNo());
- queueItem.setSeqNum(curSeqNum.get() + 1); // 浣跨敤鍚屼竴涓� 鍐呴儴搴忓彿
- queueMapper.updateById(queueItem);
- }
+ procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
}
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedQueueBO.queueNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡浼樺厛闃熷垪椤哄簭
- refreshPriorityQueue(bedQueueBO);
+ // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
}
@@ -495,8 +565,8 @@
return mapCheckTypeVsReadyMax.get( checkType );
}
- public BedQueueBO getBedQueueBO(Long roomId, String bedNo) {
- return mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
+ public BedBO getBedQueueBO(Long roomId, String bedNo) {
+ return mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
}
public MonitorInfoVO getMonitorInfo() {
@@ -510,76 +580,189 @@
public void monitorInfo() {
MonitorInfoVO monitorInfoVO = new MonitorInfoVO();
roomBedStatistic(monitorInfoVO);
- log.info(" opening " + openingFlag.get() + " " + monitorInfoVO.getQueueNum() + " " + monitorInfoVO.getActiveQueueNum() + " " + monitorInfoVO.getCheckTypeBedInfo().toString() );
+ log.info(" opening " + openingFlag.get() + " " + monitorInfoVO.getOpeningBedNum() + " " + monitorInfoVO.getDocBedNum() + " " + monitorInfoVO.getCheckTypeBedInfo().toString() );
}
- 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 void hurryupOneBedCheckTypeList(BedBO bedBO) {
+ // 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅涓嶅啀鏂板鍊欒瘖鎮ｈ�呫��
+ // 宸叉湁鍊欒瘖鎮ｈ�呬粛鍙甯稿彨鍙凤紙鏈柟娉曞彧璐熻矗"琛ラ綈鍊欒瘖"锛屼笉鍙備笌鍙彿锛夈��
+ if (Boolean.TRUE.equals(bedBO.getStopReady())) {
+ return;
+ }
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
+ // 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
+ Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
+ curSeqNum.get() + 1,
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus(),
+ bedBO.checkTypes);
+
+ // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
+ if (null == updateNum || 0 == updateNum) {
+ return;
+ }
+
+ QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );
+
+ // 鎶㈠埌鎺掗槦鎮ｈ�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
+ }
+
+ curSeqNum.getAndIncrement();
+
+ bedBO.readyPatNum++;
+ }
+
+ // 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
+ }
+
+ /**
+ * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[鍊欒瘖涓璢鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
+ */
+ private void procAffinityWhenPreempt(QueueDO preemptQueueItem, Integer[] affinityCheckTypes) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ preemptQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.WAITING.getStatus());
+ for (int i = 0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ queueItem.setStatus(QueueStatusEnum.AFFINITY.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+ queueItem.setAffinityItem( 1 );
+ queueItem.setRoomId(preemptQueueItem.getRoomId());
+ queueItem.setRoomName(preemptQueueItem.getRoomName());
+ queueItem.setBedNo(preemptQueueItem.getBedNo());
+ queueItem.setSeqNum( preemptQueueItem.getSeqNum()); // 浣跨敤鍚屼竴涓� 鍐呴儴搴忓彿
+ queueMapper.updateById(queueItem);
+ }
+ }
+
+ /**
+ * [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ */
+ private void procAffinityWhenRecalled(QueueDO recalledQueueItem, Integer[] affinityCheckTypes) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ recalledQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY.getStatus());
+ for (int i = 0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ queueItem.setSeqNum( recalledQueueItem.getSeqNum() ); // [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢锛屽師鍐呴儴搴忓彿鏇存柊
+ queueMapper.updateById(queueItem);
+ }
+ }
+
+ 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; //鍙栧ぇ鍊�
+ ret = ret < tmp ? tmp : ret; //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊�
}
return ret;
}
- private void addPriorityQueue(BedQueueBO bedQueueBO) {
- Integer[] checkTypes = bedQueueBO.getCheckTypes();
+ private void addBedToRoutingQueue(BedBO bedBO) {
+ // 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
+ if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
+ return;
+
+ // 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅涓嶈繘鍒嗘祦闃熷垪銆�
+ // 杩欐槸**鍞竴鍏ュ彛**鐨勭粺涓�闂ㄩ椄锛氬彧瑕佸伐浣嶈鏍囪涓哄仠姝㈠�欒瘖锛�
+ // 鏃犺浠庡摢鏉¤矾寰勶紙寮�璇� addBedToRoutingQueue銆佸尰鐢熸仮澶嶃�乥edReload銆�
+ // 鎴栨墜鍔ㄦ仮澶嶅紑鍏筹級璇曞浘鍔犲叆锛岄兘浼氳鎷掔粷锛屼粠鑰屼繚璇侊細
+ // 路 宸叉湁鍊欒瘖鎮ｈ�呬粛鍙甯稿彨鍙凤紙nextPatient 涓嶆鏌ヨ寮�鍏筹級
+ // 路 浣嗕笉浼氬啀琚垎閰嶃�愭帓闃熶腑銆戠殑鏂版偅鑰�
+ if (Boolean.TRUE.equals(bedBO.getStopReady())) {
+ log.info("[addBedToRoutingQueue] 宸ヤ綅澶勪簬[鍋滄鍊欒瘖]锛岃烦杩囧姞鍏ュ垎娴侀槦鍒�. roomId={} bedNo={}",
+ bedBO.getRoomId(), bedBO.getBedNo());
+ return;
+ }
+
+ // 鍚屾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);
- // 瑁呮満宸ヤ綅 涓嶈繘 浼樺厛闃熷垪锛屼笉浠庢帓闃熶腑鎺ユ敹浜�
- if (checkTypeDO.getNeedDevReady() == 1 && bedQueueBO.getOpType() == 2) {
- return;
- }
-
- PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypePriorityQueue.get(checkType);
- if (null == priorityQueue) {
- priorityQueue = new PriorityBlockingQueue<BedQueueBO>();
- mapCheckTypePriorityQueue.put( checkType, priorityQueue );
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ if (null == routingQueue) {
+ routingQueue = new PriorityBlockingQueue<BedBO>();
+ mapCheckTypeRoutingQueue.put( checkType, routingQueue );
}
- if (!priorityQueue.contains(bedQueueBO)) {
- priorityQueue.offer(bedQueueBO);
+ if (!routingQueue.contains(bedBO)) {
+ routingQueue.offer(bedBO);
} else {
- log.error("bedDoctorResume priorityQueue still exist!. " + bedQueueBO.getRoomId() + " " + bedQueueBO.getBedNo());
+ log.error("bedDoctorResume routingQueue still exist!. " + bedBO.getRoomId() + " " + bedBO.getBedNo());
}
});
}
- private void removePriorityQueue(BedQueueBO bedQueueBO) {
- Integer[] checkTypes = bedQueueBO.getCheckTypes();
+ private void removeBedFromRoutingQueue(BedBO bedBO) {
+ // 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
+ if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
+ return;
+
+ Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
- PriorityBlockingQueue<BedQueueBO> priorityBlockingQueue = mapCheckTypePriorityQueue.get(checkType);
- if (null != priorityBlockingQueue)
- priorityBlockingQueue.remove(bedQueueBO);
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ if (null != routingQueue)
+ routingQueue.remove(bedBO);
});
}
- private void refreshPriorityQueue(BedQueueBO bedQueueBO) {
- Integer[] checkTypes = bedQueueBO.getCheckTypes();
+ private void refreshBedPriorityLevelInRoutingQueue(BedBO bedBO) {
+ // 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
+ if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
+ return;
+
+ Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
- PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypePriorityQueue.get(checkType);
- priorityQueue.remove(bedQueueBO);
- priorityQueue.offer(bedQueueBO);
+ PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
+ if (null != routingQueue) {
+ routingQueue.remove(bedBO);
+ routingQueue.offer(bedBO);
+ }
});
+ }
+
+ /**
+ * 妫�鏌ラ」杩涘叆鍒� [瀹夎涓璢 鏃讹紝鎷� [宸查鐢╙ + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
+ */
+ private void procAffinityWhenSomeOneEntryInstalling(String patId, Long roomId_operator, String bedNo_operator, Integer[] affinityCheckTypes) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ patId, affinityCheckTypes, QueueStatusEnum.RECEIVED.getStatus());
+ 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);
+ }
}
private void roomBedStatistic(MonitorInfoVO monitorInfoVO) {
Map<Integer, Integer> mapOpeningCheckBedStatInfo = new HashMap<>();
Map<Integer, Integer> mapOpeningInstallBedStatInfo = new HashMap<>();
- Map<Integer, Integer> mapOperatingCheckBedStatInfo = new HashMap<>();
- Map<Integer, Integer> mapOperatingInstallBedStatInfo = new HashMap<>();
+ Map<Integer, Integer> mapDocCheckBedStatInfo = new HashMap<>();
+ Map<Integer, Integer> mapDocInstallBedStatInfo = new HashMap<>();
mapCheckTypeVsReadyMax.keySet().forEach( checkType -> {
mapOpeningCheckBedStatInfo.put(checkType, 0);
mapOpeningInstallBedStatInfo.put(checkType, 0);
- mapOperatingCheckBedStatInfo.put(checkType, 0);
- mapOperatingInstallBedStatInfo.put(checkType, 0);
+ mapDocCheckBedStatInfo.put(checkType, 0);
+ mapDocInstallBedStatInfo.put(checkType, 0);
});
//寮�閫氱殑 鍜� 杩愯惀涓� 鐨勫伐浣嶇粺璁�
- mapBedVsQueue.values().forEach( bedQueueBO -> {
+ mapOpeningBed.values().forEach(bedQueueBO -> {
Integer[] checkTypes = bedQueueBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
if (bedQueueBO.opType == 0 || bedQueueBO.opType == 1)
@@ -587,19 +770,20 @@
else
mapOpeningInstallBedStatInfo.put(checkType, mapOpeningInstallBedStatInfo.get(checkType) + 1 );
- if (bedQueueBO.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus()) {
+ if (bedQueueBO.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus() ||
+ bedQueueBO.getStatus() == BedStatusEnum.DOCTOR_PAUSE.getStatus()) {
if (bedQueueBO.opType == 0 || bedQueueBO.opType == 1)
- mapOperatingCheckBedStatInfo.put(checkType, mapOperatingCheckBedStatInfo.get(checkType) + 1);
+ mapDocCheckBedStatInfo.put(checkType, mapDocCheckBedStatInfo.get(checkType) + 1);
else
- mapOperatingInstallBedStatInfo.put(checkType, mapOperatingInstallBedStatInfo.get(checkType) + 1);
+ mapDocInstallBedStatInfo.put(checkType, mapDocInstallBedStatInfo.get(checkType) + 1);
}
});
});
- // 鎺ユ敹..鎺掗槦涓偅鑰�..鐨勪紭鍏堥槦鍒�
- HashSet<BedQueueBO> hashSetOperatingBedQueue = new HashSet<>();
- mapCheckTypePriorityQueue.values().forEach(priorityQueue->{
- priorityQueue.stream().forEach(bedQueueBO -> hashSetOperatingBedQueue.add(bedQueueBO));
+ // 鎺ユ敹..鎺掗槦涓偅鑰�..鐨勫垎娴侀槦鍒�
+ HashSet<BedBO> hashSetOperatingBedQueue = new HashSet<>();
+ mapCheckTypeRoutingQueue.values().forEach(routingQueue->{
+ routingQueue.stream().forEach(bedQueueBO -> hashSetOperatingBedQueue.add(bedQueueBO));
});
@@ -607,15 +791,19 @@
mapCheckTypeVsReadyMax.keySet().forEach( checkType -> {
String str = mapOpeningCheckBedStatInfo.get(checkType) + " " +
mapOpeningInstallBedStatInfo.get(checkType) + " " +
- mapOperatingCheckBedStatInfo.get(checkType) + " " +
- mapOperatingInstallBedStatInfo.get(checkType) + " ";
+ mapDocCheckBedStatInfo.get(checkType) + " " +
+ mapDocInstallBedStatInfo.get(checkType) + " ";
mapCheckTypeBedInfo.put( checkType, str);
});
monitorInfoVO.setCheckTypeBedInfo(mapCheckTypeBedInfo);
- monitorInfoVO.setQueueNum(mapBedVsQueue.size());
- monitorInfoVO.setActiveQueueNum((int) mapBedVsQueue.values().stream().filter(item -> item.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus()).count());
- monitorInfoVO.setPriorityQueueNum( hashSetOperatingBedQueue.size() );
+ monitorInfoVO.setOpeningBedNum(mapOpeningBed.size());
+ monitorInfoVO.setDocBedNum((int) mapOpeningBed.values().stream().filter(item ->
+ item.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus() ||
+ item.getStatus() == BedStatusEnum.DOCTOR_PAUSE.getStatus())
+ .count());
+ monitorInfoVO.setRoutingBedNum( hashSetOperatingBedQueue.size() );
+ monitorInfoVO.setMapBedVsQueue(mapOpeningBed);
}
}
--
Gitblit v1.9.3