From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 576 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 514 insertions(+), 62 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 7acf662..575ddc0 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
@@ -65,7 +65,10 @@
AtomicInteger openingFlag = new AtomicInteger(0);
- AtomicInteger curSeqNum = new AtomicInteger(0);
+
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戝師 curSeqNum锛堝垎娴佹椂缁欐偅鑰呯紪"鍐呴儴搴忓彿"鐨勫唴瀛樿鏁板櫒锛夊凡鍒犻櫎銆�
+ // 鎺掗槦鍙锋敼涓虹鍒版椂涓�娆℃�у啓鍏� queue.seq_num锛屼箣鍚庝换浣曠幆鑺傞兘涓嶅啀璧嬪彿锛�
+ // 鍒嗘祦銆佸彨鍙峰悗琛ラ綈鍊欒瘖銆佽繃鍙枫�佸彫鍥炪�佸姞鎬ャ�佽鏈洪兘鍙敼鐘舵��/璇婂/宸ヤ綅銆�
// 缁存姢 寮�鏀剧殑宸ヤ綅
ConcurrentHashMap<String, BedBO> mapOpeningBed = new ConcurrentHashMap<>();
@@ -255,25 +258,151 @@
return null == bedBO ? null : Boolean.TRUE.equals(bedBO.getStopReady());
}
- public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ /**
+ * 鍏ュ骇锛堟妸宸ヤ綅涓讳汉璁句负鎴戯級銆�
+ *
+ * @param bedId 宸ヤ綅涓婚敭锛堝墠绔姹傞噷甯︼紱**浼樺厛鎸夊畠瀹氫綅**锛岃涓嬶級鈥斺�斿彲涓虹┖锛屼负绌烘椂鎸� roomId+bedNo 瀹氫綅
+ */
+ public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName, Integer bedId) {
BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
if (null == bedBO) {
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);
+ // 鍙互"鎴愪负涓讳汉"鐨勭姸鎬侊細宸插紑閫� / 鏈夊尰鐢� / 鏆傚仠锛�**鎺掗櫎"宸插叧闂�"**锛夈��
+ // 銆愭湰娆℃斁瀹姐�戝師鏉�"鏃犱富浜�"鏃跺彧璁�"宸插紑閫�"锛氫竴鏃︽暟鎹嚭鐜�"doc_id 涓虹┖浣嗙姸鎬佷粛鏄湁鍖荤敓/鏆傚仠"
+ // 杩欑涓嶄竴鑷达紝鍖荤敓绔欏湪宸ヤ綅鍓嶅嵈濮嬬粓鍧愪笉涓婏紝鍙姤"鐘舵�佸紓甯�"锛岀幇鍦烘棤浠庡鐞嗐��
+ List<BedStatusEnum> claimableStatusList = new ArrayList<>();
+ claimableStatusList.add(BedStatusEnum.OPENING);
+ claimableStatusList.add(BedStatusEnum.DOCTOR_ON);
+ claimableStatusList.add(BedStatusEnum.DOCTOR_PAUSE);
+
+ // 銆愭湰娆′慨澶嶃�戜紭鍏堟寜**涓婚敭**鏇存柊锛氱幇鍦哄嚭鐜拌繃"宸ヤ綅鍦ㄥ簱閲屾槑鏄庣┖闂层�佸叆搴у嵈鏇存柊 0 琛�"锛�
+ // 宸叉帓闄�"琚崰鐢�"锛涘墿涓嬬殑鍙兘鏄� bed_no 涓庤姹傚�兼湁鑲夌溂闅捐鲸鐨勫樊寮�
+ // 锛堢粨灏剧┖鏍� / 澶у皬鍐� / 鍏ㄨ锛孞SON 涓庡鍒剁矘璐撮兘鐪嬩笉鍑烘潵锛夈�傚墠绔湰鏉ュ氨甯� id锛岀敤瀹冩渶绋炽��
+ Integer updateNum = null;
+ if (null != bedId) {
+ updateNum = roomMapper.setBedDoctorOnById(bedId, docId, docName,
+ BedStatusEnum.DOCTOR_ON, claimableStatusList);
+ if (null != updateNum && updateNum > 0) {
+ // 鏍￠獙涓�涓� id 鎸囧悜鐨勮纭疄灏辨槸璇锋眰鐨勫伐浣嶏紙涓嶄竴鑷磋鏄庡墠绔紦瀛樹笌搴撲笉鍚屾锛岃鏃ュ織渚夸簬鎺掓煡锛�
+ RoomDO seatRow = roomMapper.getRoom(roomId, bedNo);
+ RoomDO idRow = roomMapper.selectById(bedId);
+ if (null != idRow && null != seatRow && !idRow.getId().equals(seatRow.getId())) {
+ log.warn("[bedDoctorOn] 鎸� id 鍏ュ骇鎴愬姛锛屼絾 id 鎸囧悜鐨勫伐浣嶄笌璇锋眰鐨� roomId/bedNo 涓嶆槸鍚屼竴琛岋紒"
+ + " id={} 鈫� {}/{}, 璇锋眰 鈫� {}/{}",
+ bedId, idRow.getRoomId(), idRow.getBedNo(), roomId, bedNo);
+ }
+ }
+ }
+ if (null == updateNum || 0 == updateNum) {
+ // 鍥為��锛氭寜 roomId + bedNo 瀹氫綅锛堝吋瀹逛笉甯� id 鐨勮皟鐢ㄦ柟锛屽鑷姩鍏ュ骇鐨勮�佽矾寰勶級
+ updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName,
+ BedStatusEnum.DOCTOR_ON, claimableStatusList);
+ }
+
if ( null==updateNum || 0 == updateNum ) {
- log.error("bedDoctorOn DB invalid status. " + roomId + " " + bedNo);
+ // 浠嶅け璐� 鈫� 鎶婂簱閲�**鐪熷疄鐘舵��**鎽婂紑锛屽苟鍖哄垎鍘熷洜锛堝師鏉ヤ竴寰�"鐘舵�佸紓甯�"锛岀幇鍦虹湅涓嶅嚭鎵�浠ョ劧锛�
+ RoomDO rowById = (null == bedId) ? null : roomMapper.selectById(bedId);
+ RoomDO rowByRoomBed = roomMapper.getRoom(roomId, bedNo);
+ log.warn("[bedDoctorOn] 鍏ュ骇鏇存柊 0 琛�. 璇锋眰 roomId={} bedNo=[{}] bedId={} docId={}锛�"
+ + "鎸塱d鏌ュ埌={} 鎸塺oomId+bedNo鏌ュ埌={}",
+ roomId, bedNo, bedId, docId,
+ null == rowById ? "鏃�" : describeBedRow(rowById),
+ null == rowByRoomBed ? "鏃�" : describeBedRow(rowByRoomBed));
+
+ RoomDO occupant = (null != rowById) ? rowById : rowByRoomBed;
+ if (null != occupant && null != occupant.getDocId() && !occupant.getDocId().equals(docId)) {
+ log.warn("[bedDoctorOn] 宸ヤ綅宸茶浠栦汉鍗犵敤锛屾嫆缁濆叆搴э紙涓嶆尋鎺夛級. 鍗犵敤浜�={}({})",
+ occupant.getDocName(), occupant.getDocId());
+ return ROOM_OCCUPIED_BY_OTHER;
+ }
return ROOM_INVALID_STATUS;
}
+
+ // 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戝叆搴ф垚鍔熷悗**涓嶅啀閲婃斁**璇ュ尰鐢熺殑鍏跺畠宸ヤ綅锛�
+ // 鑺傚亣鏃ュ�肩彮鏃朵竴浣嶅尰鐢熷彲鑳藉悓鏃跺崰銆屾鏌ュ伐浣� + 棰嗙敤宸ヤ綅 + 瑁呮満宸ヤ綅銆嶏紝
+ // 鐢卞墠绔�屾垜鐨勫伐浣嶃�嶄笅鎷夊湪鍚勫伐浣嶉棿鍒囨崲锛堝啓鎿嶄綔浠嶇敱 @RequireBedOwner 鎸夊伐浣� doc_id 鏍￠獙锛夈��
+ // 鍘熷疄鐜帮細roomMapper.releaseOtherBedsOfDoc(docId, roomId, bedNo, BedStatusEnum.OPENING);
+ // 宸ヤ綅閲婃斁鏀逛负涓夌鏄庣‘閫斿緞锛氣憼 鍖荤敓鐐广�岀搴с�嶏紱鈶� 闂瘖缁熶竴娓呯┖锛涒憿 绠＄悊鍛樸�屾竻绌哄伐浣嶃��/鎺ョ彮鍖荤敓銆屾帴绠°�嶃��
bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /**
+ * 鎵嬪伐鎶婃煇浣嶃�屾帓闃熶腑銆嶆偅鑰呮媺鍏ユ寚瀹氬伐浣嶏紙宸ヤ綔鍙�"鏈瘖瀹ゆ帓闃熶腑锛堟湭鍒嗛厤锛�"鍒嗗尯鐨勩�屾媺鍏ャ�嶆寜閽級銆�
+ *
+ * <p>涓庤嚜鍔ㄥ垎娴侊紙{@code hurryupOneCheckType}锛夎蛋**鍚屼竴濂�**鍔ㄤ綔锛�
+ * 鏉′欢鏇存柊銆屾帓闃熶腑(10) 鈫� 鍑嗗涓�(20)銆嶅苟鎶� room/bed 鍐欐垚鏈伐浣嶏紝鐒跺悗澶勭悊浜插拰椤广��
+ * 鍙蜂笉鍙橈紙鍙峰湪绛惧埌鏃跺凡瀹氾級銆�
+ *
+ * <p>涓夐噸鏍￠獙锛氬伐浣嶅瓨鍦� 鈫� 璇ヨ浠嶆槸銆屾帓闃熶腑銆嶁啋 妫�鏌ラ」鐩湪鏈伐浣嶅紑灞曡寖鍥村唴銆�
+ * 鏉′欢鏇存柊鑷甫骞跺彂淇濇姢锛氫袱涓伐浣嶅悓鏃剁偣銆屾媺鍏ャ�嶏紝鍙湁涓�涓兘鎴愬姛銆�
+ */
+ public ErrorCode pullWaitingPatient(Long roomId, String bedNo, Integer queueId) {
+ RoomDO bed = (null == roomId || null == bedNo) ? null : roomMapper.getRoom(roomId, bedNo);
+ if (null == bed) {
+ log.warn("[pullWaitingPatient] 宸ヤ綅涓嶅瓨鍦�. roomId={} bedNo={}", roomId, bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ QueueDO item = (null == queueId) ? null : queueMapper.selectById(queueId);
+ if (null == item) {
+ log.warn("[pullWaitingPatient] 鎺掗槦琛屼笉瀛樺湪. queueId={}", queueId);
+ return QUEUE_NOT_EXISTS;
+ }
+ if (!QueueStatusEnum.WAITING.getStatus().equals(item.getStatus())) {
+ log.warn("[pullWaitingPatient] 璇ユ偅鑰呭凡涓嶅湪鎺掗槦涓�. queueId={} patId={} status={}",
+ queueId, item.getPatId(), item.getStatus());
+ return QUEUE_NOT_WAITING;
+ }
+ Integer[] bedCheckTypes = bed.getCheckTypes();
+ if (null == bedCheckTypes || 0 == bedCheckTypes.length
+ || null == item.getBookCheckType()
+ || !java.util.Arrays.asList(bedCheckTypes).contains(item.getBookCheckType())) {
+ log.warn("[pullWaitingPatient] 妫�鏌ラ」鐩笉鍦ㄦ湰宸ヤ綅鑼冨洿. queueId={} checkType={} 鏈伐浣�={}",
+ queueId, null == item ? null : item.getBookCheckType(), java.util.Arrays.toString(bedCheckTypes));
+ return QUEUE_CHECK_TYPE_NOT_MATCH;
+ }
+
+ Integer updateNum = queueMapper.preemptWaitingPatientById(queueId, roomId, bed.getRoomName(), bedNo,
+ QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum) {
+ log.warn("[pullWaitingPatient] 鎷夊叆鏈敓鏁堬紙宸茶鍏朵粬宸ヤ綅鎷夎蛋锛�. queueId={}", queueId);
+ return QUEUE_NOT_WAITING;
+ }
+
+ // 鍐呭瓨瀵硅薄涓庡簱鍐呬繚鎸佷竴鑷达紙浜插拰椤硅璺熼殢涓婚」鐨勮瘖瀹�/宸ヤ綅锛�
+ item.setStatus(QueueStatusEnum.READY.getStatus());
+ item.setRoomId(roomId);
+ item.setRoomName(bed.getRoomName());
+ item.setBedNo(bedNo);
+
+ try {
+ CheckTypeDO checkTypeDO = getCheckTypeItem(item.getBookCheckType());
+ if (null != checkTypeDO && null != checkTypeDO.getAffinityCheckTypes()
+ && checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenPreempt(item, checkTypeDO.getAffinityCheckTypes());
+ }
+ } catch (Exception e) {
+ // 浜插拰椤瑰鐞嗗け璐ヤ笉褰卞搷涓婚」宸叉垚鍔熸媺鍏�
+ log.error("[pullWaitingPatient] 浜插拰椤瑰鐞嗗け璐ワ紙涓婚」宸叉媺鍏ワ級. queueId={}", queueId, e);
+ }
+
+ log.info("[pullWaitingPatient] 宸叉墜宸ユ媺鍏�. roomId={} bedNo={} queueId={} patId={} seqNum={}",
+ roomId, bedNo, queueId, item.getPatId(), item.getSeqNum());
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /** 鎷间竴琛屽伐浣嶅叧閿瓧娈碉紝渚涙棩蹇�/鎺掓煡蹇�熷姣旓紙灏ゅ叾鐪� bed_no 鏄惁涓庤姹備竴鑷达級 */
+ private String describeBedRow(RoomDO row) {
+ return String.format("id=%s,room_id=%s,bed_no=[%s](len=%d),status=%s,doc_id=%s,doc_name=%s",
+ row.getId(), row.getRoomId(), row.getBedNo(),
+ null == row.getBedNo() ? -1 : row.getBedNo().length(),
+ row.getStatus(), row.getDocId(), row.getDocName());
}
public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
@@ -299,6 +428,64 @@
return GlobalErrorCodeConstants.SUCCESS;
}
+ /**
+ * 銆愭湰娆￠渶姹傘�戠鐞嗗憳寮哄埗娓呯┖宸ヤ綅锛堜笉瑕佹眰鏄湰浜猴級銆�
+ * <p>
+ * 涓� {@link #bedDoctorOff} 鐨勫尯鍒細涓嶆竻 {@code doc_id=?} 鏉′欢锛�
+ * 鍥犳鍙妸銆屽埆浜哄崰鐢ㄤ腑銆嶇殑宸ヤ綅娓呮帀 鈥斺�� 鐢ㄤ簬鍖荤敓涓嬬彮蹇樼搴с�佹崲浜轰娇鐢ㄥ悓涓�宸ヤ綅鐨勫満鏅��
+ * 浠嶇劧鍙竻銆屽尰鐢熷湪宀� / 鏆傚仠銆嶄笖 doc_id 闈炵┖鐨勫伐浣嶏紝绌洪棽宸ヤ綅涓嶄細琚鍔ㄣ��
+ */
+ public ErrorCode bedDoctorOffByAdmin(Long roomId, String bedNo) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
+ if (null == bedBO) {
+ log.error("bedDoctorOffByAdmin mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE);
+ Integer updateNum = roomMapper.setBedDoctorOffAdmin(roomId, bedNo, BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorOffByAdmin DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
+
+ removeBedFromRoutingQueue(bedBO);
+
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ log.info("[绠＄悊鍛樻竻绌哄伐浣峕 roomId={} bedNo={} 宸茬疆涓虹┖闂�", roomId, bedNo);
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /**
+ * 銆愭湰娆￠渶姹傘�戦棴璇婃竻绌猴細鎶婃墍鏈夈�屽尰鐢熷湪宀� / 鏆傚仠銆嶇殑宸ヤ綅缃负绌洪棽锛坉oc_id / doc_name 娓呯┖锛夈��
+ * <p>
+ * 涓� {@link #closeBiz()} 閰嶅悎锛氬厛娓呭簱锛岄殢鍚� {@code startBedReload()} 浼氭寜搴撻噸鏂拌杞藉唴瀛橈紝
+ * 淇濊瘉鍐呭瓨锛坢apOpeningBed / 鍒嗘祦闃熷垪锛変笌搴撲竴鑷淬��
+ *
+ * @return 娓呯┖鐨勫伐浣嶆暟
+ */
+ public int closeBizClearBeds() {
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE);
+ Integer updateNum = roomMapper.clearAllBedDoctors(BedStatusEnum.OPENING, statusList);
+
+ // 鍐呭瓨鍚屾锛氭妸宸ヤ綅鐘舵�佹敼鍥炵┖闂诧紝骞朵粠鍒嗘祦闃熷垪鎽橀櫎锛堥伩鍏嶉棴璇婂悗浠嶆湁宸ヤ綅琚淳鎮ｈ�咃級
+ // 娉ㄦ剰锛歴tatus 鏄� Integer 鍖呰绫诲瀷锛屽繀椤荤敤 equals 姣旇緝锛�== 鍙湪 -128~127 缂撳瓨鍖洪棿鍐呭伓鐒舵垚绔嬶級
+ for (BedBO bedBO : mapOpeningBed.values()) {
+ if (Objects.equals(BedStatusEnum.DOCTOR_ON.getStatus(), bedBO.getStatus())
+ || Objects.equals(BedStatusEnum.DOCTOR_PAUSE.getStatus(), bedBO.getStatus())) {
+ removeBedFromRoutingQueue(bedBO);
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ }
+ }
+ log.info("[闂瘖] 宸叉竻绌哄綋鐝伐浣� {} 涓紙doc_id / doc_name 缃┖锛岀姸鎬佹敼涓虹┖闂诧級",
+ updateNum == null ? 0 : updateNum);
+ return updateNum == null ? 0 : updateNum;
+ }
+
/* 2024.11.11
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
@@ -321,21 +508,75 @@
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
- QueueDO firstReadyQueueItem = queueMapper.getBedFirstQueueItemByStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
- // 璇ュ伐浣� 娌℃湁 [鍊欒瘖涓腑] 浜哄憳
- if (null == firstReadyQueueItem) {
+ // 鈸� 銆愬苟鍙戝姞鍥郝锋湰闇�姹傘�戞湰宸ヤ綅**宸叉湁銆屽氨璇婁腑(30)銆嶆偅鑰呮椂涓嶅啀鍙笅涓�浣�**銆�
+ //
+ // 鍘熷厛杩欎釜鍒ゆ柇鍙湪 `QueueServiceImpl#finishNextPatient` 閲屽仛杩囷紝鑰屽畠浣嶄簬
+ // singleThreadExecutor 涓茶鍖�**涔嬪**锛氫袱涓苟鍙戣姹傦紙鍙屽嚮 / 澶氱锛夐兘鍙兘璇诲埌 0锛�
+ // 闅忓悗鍚勮嚜鎻愪氦涓�娆� nextPatient锛屼覆琛屾墽琛屾椂浼氬悇鎺ㄨ繘涓�鏉� READY 鈬�
+ // 鍚屼竴宸ヤ綅鍑虹幇 2 涓�屽氨璇婁腑銆嶏紝鎮ｈ�呰"鍗�"鍦ㄥ氨璇婁腑銆佸伐浣嶄篃涓嶅啀琛ヤ汉銆�
+ // 杩欓噷鍦ㄤ覆琛屽尯鍐呭啀鍒や竴娆★紙鏈柟娉曞彧鐢辫涓茶绾跨▼姹犺皟鐢級銆�
+ List<Integer> onstageStatusList = new ArrayList<>();
+ onstageStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ Integer onstageNum = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, onstageStatusList);
+ if (null != onstageNum && onstageNum > 0) {
+ log.warn("[nextPatient] 鏈伐浣嶅凡鏈� {} 涓�屽氨璇婁腑銆嶆偅鑰咃紝璺宠繃鏈鍙彿锛堥槻骞跺彂鍙屽氨璇婁腑锛�. 宸ヤ綅={}/{}",
+ onstageNum, roomId, bedNo);
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ // 鈶� 鍊欒瘖涓�(20) 浼樺厛
+ QueueDO firstQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ roomId, bedNo, QueueStatusEnum.READY.getStatus());
+ boolean fromRecalled = false;
+
+ // 鈶� 鍊欒瘖鍖烘病浜烘椂锛屽洖閫�鍙栥�屽凡鍙洖(15)銆嶉噷鍙锋渶灏忕殑涓�浣�
+ //
+ // 銆愮己闄蜂慨澶嶃�戣繃鍙锋偅鑰�"鍙洖"鍚庝細鍏堢疆涓� RECALLED(15)锛屽啀闈� hurryupOneBed 鐨勮ˉ浜哄惊鐜�
+ // 鎻愬崌鎴� READY(20)銆備絾琛ヤ汉寰幆鏈変笁閬撻棬闂革紙openingFlag=0 / stopReady=true / 鍊欒瘖鍖哄凡婊★級锛�
+ // 浠讳竴鏉℃垚绔嬫偅鑰呭氨**涓�鐩村仠鍦� 15**锛涜�屽彨鍙锋鍓嶅彧璁� READY 鈬� 鍑虹幇姝荤粨锛�
+ // 鐜板満琛ㄧ幇涓�"鎺掗槦鍙� A2/A3 鐘舵�佹槸宸插彫鍥烇紝鐐瑰彨鍙峰姞杞戒笉鍑烘偅鑰呬俊鎭紝鏃犳硶妫�鏌�"锛�2026-10-29 鍙嶉锛夈��
+ // 杩欓噷鎸変笌 nextInstallPatient锛堝凡鍚� RECALLED_INSTALL锛変竴鑷寸殑鎬濊矾鐩存帴鍙埌锛�
+ // 涓嶅啀渚濊禆琛ヤ汉鏄惁鎴愬姛銆�
+ if (null == firstQueueItem) {
+ firstQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ roomId, bedNo, QueueStatusEnum.RECALLED.getStatus());
+ fromRecalled = null != firstQueueItem;
+ if (fromRecalled) {
+ log.info("[nextPatient] 鍊欒瘖鍖烘棤浜猴紝鏀瑰彨銆屽凡鍙洖銆嶆偅鑰�. 宸ヤ綅={}/{} patId={} seqNum={}",
+ roomId, bedNo, firstQueueItem.getPatId(), firstQueueItem.getSeqNum());
+ }
+ }
+
+ // 璇ュ伐浣嶆棦娌℃湁 [鍊欒瘖涓璢 涔熸病鏈� [宸插彫鍥瀅 浜哄憳
+ if (null == firstQueueItem) {
return QUEUE_NOT_READY_PATIENT;
}
- // QueueStatusEnum.READY => QueueStatusEnum.ONSTAGE
- firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
- queueMapper.updateById( firstReadyQueueItem );
+ // 鈶� READY / RECALLED => ONSTAGE锛氱敤銆屼富閿� + 褰撳墠鐘舵�併�嶆潯浠舵洿鏂帮紙骞跺彂鍔犲浐锛夛紝
+ // 0 琛岃鏄庤琛屽凡琚彟涓�璇锋眰鎺ㄨ繘锛屾湰娆℃斁寮冿紙涓嬫鍐嶅彇锛夈��
+ int curStatus = fromRecalled
+ ? QueueStatusEnum.RECALLED.getStatus() : QueueStatusEnum.READY.getStatus();
+ Integer updated = queueMapper.updateStatusByIdIfCurrent(
+ firstQueueItem.getId(), curStatus, QueueStatusEnum.ONSTAGE.getStatus());
+ if (null == updated || 0 == updated) {
+ log.warn("[nextPatient] 鍊欒瘖琛屽凡琚苟鍙戞帹杩涳紝鏀惧純鏈鍙彿. 宸ヤ綅={}/{} queueId={} 鏈熸湜鐘舵��={}",
+ roomId, bedNo, firstQueueItem.getId(), curStatus);
+ return QUEUE_NOT_READY_PATIENT;
+ }
+ firstQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
// 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 銆愬�欒瘖涓�戞偅鑰呮暟閲� 鍑忎竴
- BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
- bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
-
- refreshBedPriorityLevelInRoutingQueue(bo);
+ // 娉ㄦ剰锛氬彫鍥炵殑杩欎綅鏈潵灏变笉鍦ㄥ�欒瘖璁℃暟閲岋紝涓嶈兘鍑忥紱鍙﹀ bo 鍙兘涓� null锛堝伐浣嶄笉鍦ㄥ紑璇婂垪琛級锛�
+ // 鍘熷疄鐜扮洿鎺� bo.readyPatNum-- 浼� NPE銆�
+ BedBO bo = mapOpeningBed.get(Utils.formatRoomBed(roomId, bedNo));
+ if (null != bo) {
+ if (!fromRecalled) {
+ bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
+ }
+ refreshBedPriorityLevelInRoutingQueue(bo);
+ } else {
+ log.warn("[nextPatient] 宸ヤ綅涓嶅湪寮�璇婂垪琛紝璺宠繃鍐呭瓨璁℃暟涓庡垎娴佸埛鏂�. 宸ヤ綅={}/{}", roomId, bedNo);
+ }
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -396,9 +637,8 @@
}
});
- Integer num = queueMapper.getMaxSeqNum();
- curSeqNum = new AtomicInteger(null == num ? 0 : num);
-
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戜笉鍐嶅垵濮嬪寲鍐呭瓨璁℃暟鍣� curSeqNum锛�
+ // 鎺掗槦鍙锋潵鑷鍒版椂鐨� queue.seq_num锛屽垎娴佷笉鍐嶅垎閰嶅彿銆�
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -428,10 +668,29 @@
* 鎶婂尰鐢熷�欒瘖鐨勯槦鍒楀婊�
*/
public void hurryupOneBed(Long roomId, String bedNo) {
- if (0 == openingFlag.get())
+ if (0 == openingFlag.get()) {
+ // 銆愮幇鍦烘帓鏌ャ�戞湭寮�璇婃椂**鏁翠釜鑷姩琛ヤ汉閮芥槸鍏抽棴鐨�**锛堟帓闃熶腑鐨勭梾浜轰笉浼氳鎼繘鍊欒瘖鍖猴級銆�
+ // 鍘熷疄鐜版槸闈欓粯 return锛岀幇鍦哄彧鑳界湅鍒�"浜洪兘鍦紝灏辨槸涓嶈繘鏉�"锛屾晠杩欓噷鏄庣‘璁颁竴鏉°��
+ log.warn("[琛ヤ汉] 绯荤粺鏈浜庛�愬紑璇娿�戠姸鎬侊紙openingFlag=0锛夛紝璺宠繃鑷姩琛ヤ汉. 宸ヤ綅={}/{}锛堝彲鍦ㄧ洃鎺ч〉鐐广�屽紑璇娿�嶏級",
+ roomId, bedNo);
return;
+ }
BedBO bedBO = getBedQueueBO(roomId, bedNo);
+ if (null == bedBO) {
+ log.warn("[琛ヤ汉] 宸ヤ綅涓嶅湪銆屽凡寮�璇婂伐浣嶃�嶅垪琛ㄤ腑锛岃烦杩�. 宸ヤ綅={}/{}", roomId, bedNo);
+ return;
+ }
+
+ // 銆愭湰娆″姞鍥恒�戠敤搴撻噷鐨勭湡瀹炲�欒瘖浜烘暟鏍℃鍐呭瓨璁℃暟锛�
+ // readyPatNum 鏄唴瀛樺�硷紝鑻ユ煇鏉¤矾寰勶紙鎾ら攢/鏀惧純/杩囧彿绛夛級娌″悓姝ワ紝瀹冧細铏氶珮锛�
+ // 浜庢槸 "鍊欒瘖鍖哄凡婊�" 鐨勫垽鏂竴鐩存垚绔嬨�佹案杩滀笉琛ヤ汉锛堣�岀晫闈笂鍊欒瘖鍖哄叾瀹炴槸绌虹殑锛夈��
+ int realReadyNum = countReadyInDb(roomId, bedNo);
+ if (realReadyNum != bedBO.getReadyPatNum()) {
+ log.warn("[琛ヤ汉] 鍐呭瓨鍊欒瘖浜烘暟({}) 涓庡簱鍐�({}) 涓嶄竴鑷达紝宸叉寜搴撳唴鏍℃. 宸ヤ綅={}/{}",
+ bedBO.getReadyPatNum(), realReadyNum, roomId, bedNo);
+ bedBO.setReadyPatNum(realReadyNum);
+ }
// 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶆椂涓嶅啀鎶娿�愬凡鍙洖銆戞偅鑰呮斁鍏ュ�欒瘖鍖恒��
// 娉ㄦ剰锛氳繖**涓嶅奖鍝�**宸叉湁鍊欒瘖鎮ｈ�呰姝ｅ父鍙彿锛坣extPatient 涓嶆鏌ユ湰寮�鍏筹級锛�
@@ -440,26 +699,24 @@
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
while (!stopReady && bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
- // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.queueRecalledPatient(
- bedBO.getRoomId(),
- bedBO.getRoomName(),
- bedBO.getBedNo(),
- curSeqNum.get() + 1, // 杩囧彿鍥炴潵锛屾帓鍒板綋鍓嶇殑涓嬩竴浣�
- QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒�
- QueueStatusEnum.READY.getStatus());
- if (null == updateNum || 0 == updateNum)
+ // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夈�屽凡鍙洖(15)銆嶇殑鎮ｈ�咃紙鎺掗槦鍙锋渶灏忕殑閭ｄ竴浣嶏級
+ QueueDO recalledQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ bedBO.getRoomId(), bedBO.getBedNo(), QueueStatusEnum.RECALLED.getStatus());
+ if (null == recalledQueueItem)
break;
- // [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
- QueueDO recalledQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戣繃鍙峰彫鍥�**涓嶅啀閲嶆帓闃熷彿**锛氬彿鏄鍒版椂瀹氱殑锛�
+ // 鎮ｈ�呮寜鍘熷彿鍥炲埌鍊欒瘖搴忓垪锛堥渶姹傦細銆岀梾浜鸿繃鍙蜂簡锛屼篃鎺掔潃銆嶏級銆�
+ // 鏃у疄鐜帮紙seq_num = 褰撳墠鍙�+1锛屾帓鍒伴槦灏撅級浼氳浠栦笌灞忓箷涓�/鎮ｈ�呮墜閲岀殑鍙峰涓嶄笂銆�
+ // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒�
+ recalledQueueItem.setStatus(QueueStatusEnum.READY.getStatus());
+ queueMapper.updateById(recalledQueueItem);
+ // [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
CheckTypeDO checkTypeDO = getCheckTypeItem( recalledQueueItem.getBookCheckType() );
if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenRecalled(recalledQueueItem, checkTypeDO.getAffinityCheckTypes());
}
-
- curSeqNum.getAndIncrement();
// 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
bedBO.readyPatNum++;
@@ -516,29 +773,45 @@
return;
// 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
- bedBO.getRoomId(),
- bedBO.getRoomName(),
- bedBO.getBedNo(),
- curSeqNum.get() + 1,
+ //
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戝垎娴佸彧鍋氥�屾帓闃熶腑(10) 鈫� 鍊欒瘖涓�(20)銆嶇殑鎼縼锛�**涓嶅啀鍒嗛厤鎺掗槦鍙�**锛�
+ // 鍙峰湪绛惧埌鏃跺凡鍐欏叆 seq_num锛涘姞鎬ュ彧褰卞搷杩欓噷鐨勫彇浜洪『搴忥紙SQL 鍐� jump_flag 浼樺厛锛夈��
+ // 鏃у疄鐜版槸銆孶PDATE ... 椤哄甫 seq_num=褰撳墠鍙�+1锛屽啀鎸夊彿鏌ュ洖璇ヨ銆嶁�斺��
+ // 鍙蜂笉鍐嶅敮涓�鍚�"鎸夊彿鏌ュ洖"浼氬彇閿欎汉锛屾晠鏀逛负锛氬厛鍙栬 鈫� 鎸� id 鏉′欢鏇存柊銆�
+ QueueDO preemptQueueItem = queueMapper.getFirstWaitingByCheckTypes(
QueueStatusEnum.WAITING.getStatus(),
- QueueStatusEnum.READY.getStatus(),
bedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType
- // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
- if (null == updateNum || 0 == updateNum) {
+ // 娌℃湁鎺掗槦涓殑鎮ｈ��
+ if (null == preemptQueueItem) {
return;
}
- QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ // 鏉′欢鏇存柊锛歴tatus 蹇呴』浠嶆槸銆屾帓闃熶腑銆嶏紝淇濊瘉骞跺彂涓嬪彧鏈変竴鏂规姠鍒拌琛�
+ Integer updateNum = queueMapper.preemptWaitingPatientById(
+ preemptQueueItem.getId(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum) {
+ // 琚叾瀹冨伐浣嶆姠鍏堬細鏈疆鏀惧純锛岀瓑涓嬩竴娆¤ˉ榻愯Е鍙�
+ return;
+ }
+
+ // 鍐呭瓨瀵硅薄涓庡簱鍐呬繚鎸佷竴鑷� 鈥斺�� 浜插拰椤硅璺熼殢涓婚」鐨勮瘖瀹�/宸ヤ綅
+ preemptQueueItem.setStatus(QueueStatusEnum.READY.getStatus());
+ preemptQueueItem.setRoomId(bedBO.getRoomId());
+ preemptQueueItem.setRoomName(bedBO.getRoomName());
+ preemptQueueItem.setBedNo(bedBO.getBedNo());
+
CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );
// 鎶㈠埌鎺掗槦鎮ｈ�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
}
-
- curSeqNum.getAndIncrement();
// 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
bedBO.readyPatNum++;
@@ -587,25 +860,51 @@
// 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅涓嶅啀鏂板鍊欒瘖鎮ｈ�呫��
// 宸叉湁鍊欒瘖鎮ｈ�呬粛鍙甯稿彨鍙凤紙鏈柟娉曞彧璐熻矗"琛ラ綈鍊欒瘖"锛屼笉鍙備笌鍙彿锛夈��
if (Boolean.TRUE.equals(bedBO.getStopReady())) {
+ // 銆愮幇鍦烘帓鏌ャ�戞槑纭涓�鏉★細宸ヤ綅寮�浜嗐�屽仠姝㈠�欒瘖銆嶆椂涓嶄細鑷姩琛ヤ汉
+ log.warn("[琛ヤ汉] 宸ヤ綅澶勪簬銆愬仠姝㈠�欒瘖銆戯紝璺宠繃鑷姩琛ヤ汉. 宸ヤ綅={}/{}锛堝闇�鎺ユ敹璇峰叧闂寮�鍏筹級",
+ bedBO.getRoomId(), bedBO.getBedNo());
return;
}
+ if (bedBO.getReadyPatNum() >= bedBO.getMaxReadyPatNum()) {
+ // 銆愮幇鍦烘帓鏌ャ�戝�欒瘖鍖哄凡杈句笂闄愶紙涓婇檺=鍚勬鏌ラ」鐩� check_type.ready_num 鐨勬渶澶у�硷級
+ log.info("[琛ヤ汉] 鍊欒瘖鍖哄凡杈句笂闄愶紝璺宠繃. 宸ヤ綅={}/{} 褰撳墠鍊欒瘖={} 涓婇檺={}",
+ bedBO.getRoomId(), bedBO.getBedNo(), bedBO.getReadyPatNum(), bedBO.getMaxReadyPatNum());
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
+ return;
+ }
+ int pulledNum = 0;
while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
- bedBO.getRoomId(),
- bedBO.getRoomName(),
- bedBO.getBedNo(),
- curSeqNum.get() + 1,
+ //
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戜笌 hurryupOneCheckType 鐩稿悓锛氬彧鎼縼鐘舵�侊紝**涓嶅啀鍒嗛厤鎺掗槦鍙�**銆�
+ QueueDO preemptQueueItem = queueMapper.getFirstWaitingByCheckTypes(
QueueStatusEnum.WAITING.getStatus(),
- QueueStatusEnum.READY.getStatus(),
bedBO.checkTypes);
- // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
- if (null == updateNum || 0 == updateNum) {
+ // 娌℃湁鎺掗槦涓殑鎮ｈ��
+ if (null == preemptQueueItem) {
return;
}
- QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ // 鏉′欢鏇存柊锛歴tatus 蹇呴』浠嶆槸銆屾帓闃熶腑銆嶏紝淇濊瘉骞跺彂涓嬪彧鏈変竴鏂规姠鍒拌琛�
+ Integer updateNum = queueMapper.preemptWaitingPatientById(
+ preemptQueueItem.getId(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum) {
+ // 琚叾瀹冨伐浣嶆姠鍏堬細鏈疆鏀惧純锛岀瓑涓嬩竴娆¤ˉ榻愯Е鍙�
+ return;
+ }
+
+ // 鍐呭瓨瀵硅薄涓庡簱鍐呬繚鎸佷竴鑷� 鈥斺�� 浜插拰椤硅璺熼殢涓婚」鐨勮瘖瀹�/宸ヤ綅
+ preemptQueueItem.setStatus(QueueStatusEnum.READY.getStatus());
+ preemptQueueItem.setRoomId(bedBO.getRoomId());
+ preemptQueueItem.setRoomName(bedBO.getRoomName());
+ preemptQueueItem.setBedNo(bedBO.getBedNo());
+
CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );
// 鎶㈠埌鎺掗槦鎮ｈ�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
@@ -613,17 +912,91 @@
procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
}
- curSeqNum.getAndIncrement();
-
bedBO.readyPatNum++;
+ pulledNum++;
+ }
+
+ if (pulledNum > 0) {
+ log.info("[琛ヤ汉] 宸茶ˉ鍏� {} 浜�. 宸ヤ綅={}/{} 褰撳墠鍊欒瘖={} 涓婇檺={}",
+ pulledNum, bedBO.getRoomId(), bedBO.getBedNo(),
+ bedBO.getReadyPatNum(), bedBO.getMaxReadyPatNum());
}
// 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
refreshBedPriorityLevelInRoutingQueue(bedBO);
}
+ /** 搴撻噷璇ュ伐浣嶅綋鍓嶃�屽噯澶囦腑(20)銆嶇殑鐪熷疄浜烘暟锛堢敤浜庢牎姝ｅ唴瀛樿鏁颁笌鐜板満璇婃柇锛� */
+ private int countReadyInDb(Long roomId, String bedNo) {
+ List<Integer> readyStatus = new ArrayList<>();
+ readyStatus.add(QueueStatusEnum.READY.getStatus());
+ List<QueueDO> readyList = queueMapper.getBedQueueByStatus(roomId, bedNo, readyStatus);
+ return null == readyList ? 0 : readyList.size();
+ }
+
/**
- * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[鍊欒瘖涓璢鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
+ * 绔嬪嵆琛ヤ汉锛堢幇鍦鸿嚜鏁� + 鑷姪璇婃柇锛夛細鎵嬪姩瑙﹀彂涓�娆¤宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞舵妸"涓轰粈涔堟病琛�/琛ヤ簡鍑犱汉"涓�璧疯繑鍥炪��
+ *
+ * <p>鐢ㄤ簬宸ヤ綔鍙板�欒瘖鍖轰负绌烘椂鐨勩�岀珛鍗宠ˉ浜恒�嶆寜閽細涓嶅繀绛夊畾鏃朵换鍔°�佷篃涓嶇敤閲嶅惎鍘荤寽鏄摢閬撻棬闂告尅浣忕殑銆�
+ */
+ public Map<String, Object> hurryUpNow(Long roomId, String bedNo) {
+ Map<String, Object> data = new LinkedHashMap<>();
+ int flag = openingFlag.get();
+ data.put("绯荤粺寮�璇婄姸鎬�", 0 == flag ? "宸查棴璇婏紙姝ゆ椂涓嶄細鑷姩琛ヤ汉锛岃鍏堝湪鐩戞帶椤电偣銆屽紑璇娿�嶏級" : "寮�璇婁腑");
+
+ BedBO bedBO = getBedQueueBO(roomId, bedNo);
+ if (null == bedBO) {
+ data.put("缁撹", "璇ュ伐浣嶄笉鍦ㄣ�屽凡寮�璇婂伐浣嶃�嶅垪琛ㄩ噷锛堝彲鑳藉凡鍏抽棴/鏈鏈紑璇婏級锛屾棤娉曡ˉ浜猴紱璇峰厛鍒伴�夊伐浣嶉〉鍏ュ骇鎴栬绠＄悊鍛樺紑璇�");
+ log.warn("[琛ヤ汉] hurryUpNow 宸ヤ綅涓嶅瓨鍦�. 宸ヤ綅={}/{}", roomId, bedNo);
+ return data;
+ }
+
+ boolean stopReady = Boolean.TRUE.equals(bedBO.getStopReady());
+ int before = countReadyInDb(roomId, bedNo);
+ int memoryBefore = bedBO.getReadyPatNum();
+ // 鍏堟寜搴撳唴鐪熷疄鍊兼牎姝ｅ唴瀛橈紙鍐呭瓨铏氶珮浼氬鑷存案涔�"宸叉弧"锛�
+ bedBO.setReadyPatNum(before);
+
+ data.put("宸ヤ綅", bedBO.getRoomName() + " " + bedNo);
+ data.put("妫�鏌ラ」鐩�", null == bedBO.getCheckTypes() ? "[]" : java.util.Arrays.toString(bedBO.getCheckTypes()));
+ data.put("鍋滄鍊欒瘖", stopReady);
+ data.put("鍊欒瘖涓婇檺", bedBO.getMaxReadyPatNum());
+ data.put("琛ヤ汉鍓嶅�欒瘖浜烘暟", before + (memoryBefore == before ? "" : "锛堝唴瀛樻浘涓� " + memoryBefore + "锛屽凡鏍℃锛�"));
+
+ if (0 == flag) {
+ data.put("缁撹", "绯荤粺宸查棴璇婏紝鏈鏈ˉ浜猴紱璇峰厛鍦ㄧ洃鎺ч〉鐐广�屽紑璇娿��");
+ return data;
+ }
+ if (stopReady) {
+ data.put("缁撹", "鏈伐浣嶅紑浜嗐�屽仠姝㈠�欒瘖銆嶏紝鏈鏈ˉ浜猴紱濡傞渶鎺ユ敹鎮ｈ�呰鍏抽棴璇ュ紑鍏�");
+ return data;
+ }
+
+ hurryupOneBed(roomId, bedNo);
+
+ int after = countReadyInDb(roomId, bedNo);
+ int pulled = Math.max(0, after - before);
+ data.put("琛ヤ汉鍚庡�欒瘖浜烘暟", after);
+ data.put("鏈琛ュ叆", pulled);
+ if (pulled > 0) {
+ data.put("缁撹", "宸茶ˉ鍏� " + pulled + " 浜�");
+ } else if (after >= bedBO.getMaxReadyPatNum()) {
+ data.put("缁撹", "鍊欒瘖鍖哄凡杈句笂闄愶紙" + after + "/" + bedBO.getMaxReadyPatNum() + "锛夛紝涓嶅啀琛ヤ汉");
+ } else {
+ data.put("缁撹", "娌℃湁鍖归厤鏈伐浣嶆鏌ラ」鐩殑銆屾帓闃熶腑銆嶆偅鑰咃紙鍙埌宸ヤ綔鍙版煡鐪嬨�屾湰璇婂鎺掗槦涓紙鏈垎閰嶏級銆嶅垎鍖猴級");
+ }
+ log.info("[琛ヤ汉] hurryUpNow 宸ヤ綅={}/{} 鍓�={} 鍚�={} 缁撹={}", roomId, bedNo, before, after, data.get("缁撹"));
+ return data;
+ }
+
+ /**
+ * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[鍊欒瘖涓璢鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」銆�
+ *
+ * <p>銆愪翰鍜岄」涓庢帓闃熷彿銆戜翰鍜岄」鐩紙鍚屼竴鎮ｈ�呫�佸彲鍦ㄤ竴涓伐浣嶄竴璧峰仛鐨勫涓鏌ラ」锛夊湪鍊欒瘖鍖�
+ * <b>璺熼殢涓婚」鏄剧ず</b>锛氳繖閲屾妸浜插拰椤圭殑鎺掗槦鍙锋敼鎴�**涓婚」鐨勫彿**銆佸苟鎼埌涓婚」鎵�鍦ㄨ瘖瀹�/宸ヤ綅锛�
+ * 鐣岄潰锛堝伐浣滃彴/璇婇棿灞�/澶у睆锛夋墠鑳芥妸涓よ�呮帓鍦ㄤ竴璧枫��
+ * <p>娉ㄦ剰杩�**涓嶆槸**"閲嶆柊璧嬪彿"锛氬彿浠嶆槸绛惧埌鏃跺畾鐨勯偅涓紝鍙槸浜插拰椤规部鐢ㄤ富椤圭殑鍙凤紝
+ * 涓�"鍒嗘祦/鍙彿/鍙洖涓嶅啀鏀瑰彿"骞朵笉鍐茬獊銆�
*/
private void procAffinityWhenPreempt(QueueDO preemptQueueItem, Integer[] affinityCheckTypes) {
List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
@@ -635,33 +1008,91 @@
queueItem.setRoomId(preemptQueueItem.getRoomId());
queueItem.setRoomName(preemptQueueItem.getRoomName());
queueItem.setBedNo(preemptQueueItem.getBedNo());
- queueItem.setSeqNum( preemptQueueItem.getSeqNum()); // 浣跨敤鍚屼竴涓� 鍐呴儴搴忓彿
+ queueItem.setSeqNum( preemptQueueItem.getSeqNum()); // 浜插拰椤规部鐢ㄤ富椤圭殑鎺掗槦鍙凤紙璺熼殢鏄剧ず锛�
queueMapper.updateById(queueItem);
}
}
/**
- * [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ * [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫銆�
+ *
+ * <p>鍙洖鏃朵富椤圭殑鍙蜂笉鍙橈紝鍥犳鍙渶璁╁凡缁忚窡闅忕殑浜插拰椤逛繚鎸佷竴鑷达紙淇濇寔鍚屽彿 鈫� 鐣岄潰浠嶆帓鍦ㄤ竴璧凤級銆�
*/
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() ); // [杩囧彿] 鎮ｈ�� => [鍊欒瘖涓璢锛屽師鍐呴儴搴忓彿鏇存柊
+ queueItem.setSeqNum( recalledQueueItem.getSeqNum() ); // 浜插拰椤逛笌涓婚」淇濇寔鍚屼竴涓彿
queueMapper.updateById(queueItem);
}
}
+ /**
+ * 宸ヤ綅銆屽�欒瘖鍖哄閲忎笂闄愩��= 璇ュ伐浣嶅紑灞曠殑**鍚勬鏌ラ」鐩�** {@code check_type.ready_num}
+ * 锛堥〉闈㈠瓧娈碉細銆屾鏌ョ被鍨嬬鐞嗐�嶁啋銆屽�欒瘖鍑嗗浜烘暟銆嶏級鐨�**鏈�澶у��**銆�
+ *
+ * <p><b>杩斿洖 0 琛ㄧず"涓嶈嚜鍔ㄥ垎娴�"</b>锛氭鏃舵帓闃熶腑(10) 鐨勬偅鑰�**涓嶄細**琚富鍔ㄦ惉杩涘�欒瘖鍖�(20)锛�
+ * 闇�瑕佸尰鐢熷湪鍊欒瘖鍖虹敤銆屾媺鍏ャ�嶆墜鍔ㄨˉ浜猴紙鐜板満纭鐨勫彛寰勶級銆�
+ *
+ * <p>銆愭湰娆″姞鍥恒��
+ * <ul>
+ * <li><b>瀹炴椂璇诲簱</b>锛氬師鏉ヨ繖浠介厤缃彧鍦ㄦ湇鍔″惎鍔ㄦ椂鍔犺浇涓�娆�
+ * 锛坽@code MySpringEventListener} 鈫� {@code initCheckType()}锛夛紝
+ * 鍦ㄩ〉闈笂鏀逛簡銆屽�欒瘖鍑嗗浜烘暟銆嶅繀椤�**閲嶅惎鏈嶅姟**鎵嶇敓鏁堬紱</li>
+ * <li><b>瀹归敊</b>锛氭鏌ラ」鐩湪閰嶇疆閲屾煡涓嶅埌銆佹垨 {@code ready_num} 涓虹┖ 鈫� **璺宠繃骞惰璀﹀憡**锛�
+ * 涓嶅啀鎶� NPE銆傚師鍏堣繖涓� NPE 鍙戠敓鍦� {@code addBedToRoutingQueue}锛堝叆搴�/寮�璇�/閲嶈浇閮戒細璧帮級锛�
+ * 浼氳繛甯︽妸鍏ュ骇寮勫け璐ャ��</li>
+ * </ul>
+ */
private Integer getBedReadyMax(BedBO bedBO) {
Integer[] checkTypes = bedBO.getCheckTypes();
+ if (null == checkTypes || 0 == checkTypes.length) {
+ return 0;
+ }
+ Map<Integer, CheckTypeDO> fresh = readCheckTypeMapFresh();
int ret = 0;
for (Integer checkType : checkTypes) {
- CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkType);
+ CheckTypeDO checkTypeDO = fresh.get(checkType);
+ if (null == checkTypeDO) {
+ // 鍏煎锛氬疄鏃惰澶辫触鏃跺洖钀藉埌鍚姩缂撳瓨锛屼袱杈归兘娌℃湁灏辫烦杩囷紙涓嶅啀 NPE锛�
+ checkTypeDO = getCheckTypeItem(checkType);
+ }
+ if (null == checkTypeDO) {
+ log.warn("[getBedReadyMax] 妫�鏌ラ」鐩湪 check_type 閲屼笉瀛樺湪锛岃烦杩囷紙鎸� 0 璁★級. checkType={} 宸ヤ綅={}/{}",
+ checkType, bedBO.getRoomId(), bedBO.getBedNo());
+ continue;
+ }
Integer tmp = checkTypeDO.getReadyNum();
- ret = ret < tmp ? tmp : ret; //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊�
+ if (null == tmp) {
+ log.warn("[getBedReadyMax] 妫�鏌ラ」鐩甗鍊欒瘖鍑嗗浜烘暟]涓虹┖锛岃烦杩�. checkType={} name={}",
+ checkType, checkTypeDO.getName());
+ continue;
+ }
+ ret = Math.max(ret, tmp); //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊�
}
return ret;
+ }
+
+ /**
+ * 瀹炴椂璇诲彇銆屾鏌ラ」鐩�� 鈫� 妫�鏌ラ」鐩厤缃�嶆槧灏勶紙姣忔瑁呴厤宸ヤ綅鏃惰涓�娆″叏琛紝妫�鏌ラ」鐩彧鏈夊崄鍑犱釜锛岄噺绾у緢灏忥級銆�
+ * 杩欐牱绠＄悊鍛樺湪銆屾鏌ョ被鍨嬬鐞嗐�嶉噷鏀逛簡銆屽�欒瘖鍑嗗浜烘暟銆�**绔嬪埢鐢熸晥锛屼笉鐢ㄩ噸鍚湇鍔�**銆�
+ * 璇诲簱澶辫触鏃跺洖钀藉埌鍚姩鏃跺姞杞界殑缂撳瓨锛坽@link #initCheckType()}锛夈��
+ */
+ private Map<Integer, CheckTypeDO> readCheckTypeMapFresh() {
+ try {
+ List<CheckTypeDO> list = checkTypeMapper.simpleCheckTypeList();
+ Map<Integer, CheckTypeDO> map = new HashMap<>();
+ for (CheckTypeDO item : list) {
+ if (null != item && null != item.getValue()) {
+ map.put(item.getValue(), item);
+ }
+ }
+ return map;
+ } catch (Exception e) {
+ log.warn("[readCheckTypeMapFresh] 瀹炴椂璇绘鏌ラ」鐩け璐ワ紝鏀圭敤鍚姩鏃剁紦瀛�", e);
+ return null == mapCheckTypeVsReadyMax ? new HashMap<>() : mapCheckTypeVsReadyMax;
+ }
}
private void addBedToRoutingQueue(BedBO bedBO) {
@@ -687,6 +1118,14 @@
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList);
bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) );
bedBO.setReadyPatNum( queueDOList.size() );
+
+ // 銆愮幇鍦烘帓鏌ャ�戞妸"鍊欒瘖鍖轰笂闄� / 褰撳墠浜烘暟 / 鏉ユ簮"鎵撳嚭鏉ワ細
+ // 涓婇檺=0 琛ㄧず**涓嶈嚜鍔ㄥ垎娴�**锛堟帓闃熶腑鐨勬偅鑰呬笉浼氳涓诲姩鎼繘鍊欒瘖鍖猴紝闇�鍦ㄥ�欒瘖鍖烘墜鍔ㄣ�屾媺鍏ャ�嶏級銆�
+ // 鐜板満鍙嶉杩�"鏈夎繖涔堝鎺掗槦鐥呬汉锛屼负浠�涔堟病涓诲姩鍔犺浇鍒板�欒瘖鍖�"锛屼竴鏉℃棩蹇楀嵆鍙嚜璇併��
+ log.info("[addBedToRoutingQueue] 宸ヤ綅 {}/{} 鍊欒瘖涓婇檺={} 褰撳墠鍊欒瘖={} 妫�鏌ラ」鐩�={}"
+ + "锛堜笂闄�=鍚勬鏌ラ」鐩� check_type.ready_num 鐨勬渶澶у�硷紱0=涓嶈嚜鍔ㄥ垎娴侊紝闈犲伐浣嶆墜鍔ㄣ�屾媺鍏ャ�嶏級",
+ bedBO.getRoomId(), bedBO.getBedNo(), bedBO.getMaxReadyPatNum(), bedBO.getReadyPatNum(),
+ null == bedBO.getCheckTypes() ? "[]" : java.util.Arrays.toString(bedBO.getCheckTypes()));
Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
@@ -802,6 +1241,19 @@
item.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus() ||
item.getStatus() == BedStatusEnum.DOCTOR_PAUSE.getStatus())
.count());
+ // 銆愭湰闇�姹偮风粺璁℃寜浜哄悎骞躲�戝湪搴�**鍖荤敓鏁�**锛氫竴浜哄宸ヤ綅鏃朵笂闈㈢殑 docBedNum 浼氭寜宸ヤ綅绱锛�
+ // 杩欓噷鎸� doc_id 鍘婚噸锛岀粰鐩戞帶椤典竴涓�"鍒板簳鍑犱釜鍖荤敓鍦ㄥ矖"鐨勬寚鏍囥��
+ List<Integer> seatedStatusList = new ArrayList<>();
+ seatedStatusList.add(BedStatusEnum.DOCTOR_ON.getStatus());
+ seatedStatusList.add(BedStatusEnum.DOCTOR_PAUSE.getStatus());
+ try {
+ Integer docNum = roomMapper.countSeatedDoctors(seatedStatusList);
+ monitorInfoVO.setDocNum(null == docNum ? 0 : docNum);
+ } catch (Exception e) {
+ // 缁熻澶辫触涓嶅奖鍝嶇洃鎺ч〉鍏跺畠鏁版嵁
+ log.warn("[roomBedStatistic] 缁熻鍦ㄥ骇鍖荤敓鏁板け璐ワ紙涓嶅奖鍝嶅叾瀹冩寚鏍囷級", e);
+ monitorInfoVO.setDocNum(0);
+ }
monitorInfoVO.setRoutingBedNum( hashSetOperatingBedQueue.size() );
monitorInfoVO.setMapBedVsQueue(mapOpeningBed);
}
--
Gitblit v1.9.3