From 961157b9902ce78c2e86d2cca8f2f882cb09753f Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 14 四月 2025 13:36:52 +0800 Subject: [PATCH] 获取 下一个安装患者 seq_num create_time 不考虑book_timeslot --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 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 302399f..21af634 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 @@ -281,27 +281,23 @@ // 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰� 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.getFirstInstallItemByRoomAndStatus(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; } -- Gitblit v1.9.3