From 11e73608f1a558c094811aae97a5bccd60317bc2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 10:24:34 +0800
Subject: [PATCH] Fix Bug: 工位 准备中数量 不对
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 109 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 87 insertions(+), 22 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 f044cb7..6c7db20 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
@@ -3,6 +3,7 @@
import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+import cn.lihu.jh.module.ecg.Utils;
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;
@@ -15,6 +16,7 @@
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
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;
import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -39,6 +41,9 @@
@Validated
@Slf4j
public class QueueServiceTxFunctions {
+
+ @Resource
+ private ConfigApi configApi;
@Resource
private OAuth2TokenApi oAuth2TokenApi;
@@ -79,7 +84,7 @@
* @return
*/
public ErrorCode bedOpen(Long roomId, String roomName, String bedNo) {
- BedQueueBO bedQueueBO2 = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO2 = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
if (null != bedQueueBO2) {
log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo);
return QUEUE_BED_EXIST;
@@ -94,7 +99,7 @@
return ROOM_INVALID_STATUS;
}
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, queueStatusList);
@@ -110,13 +115,13 @@
bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
bedQueueBO.setCheckTypes( roomDO.getCheckTypes() );
bedQueueBO.setOpType( roomDO.getOpType() );
- mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);
+ mapBedVsQueue.put( Utils.formatRoomBed(roomId, bedNo), bedQueueBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedClose(Long roomId, String bedNo) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
if (null == bedQueueBO) {
log.error("bedClose mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
@@ -125,7 +130,7 @@
// 闄や簡鍒ゆ柇 鍑嗗鍊欒瘖涓� 鐨勪汉鏁帮紝杩橀渶瑕� 鍒ゆ柇 杩囧彿鐨勪汉鏁�
//if (bedQueueBO.getQueueNum().get() >0)
// return QUEUE_HAVE_PATIENT;
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
@@ -145,13 +150,13 @@
return ROOM_INVALID_STATUS;
}
- mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
+ mapBedVsQueue.remove( Utils.formatRoomBed(roomId, bedNo) );
removePriorityQueue(bedQueueBO);
return GlobalErrorCodeConstants.SUCCESS;
}
public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
if (null == bedQueueBO) {
log.error("bedDoctorPause mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
@@ -172,7 +177,7 @@
}
public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
if (null == bedQueueBO || !bedQueueBO.getStatus().equals(BedStatusEnum.PAUSE.getStatus())) {
log.error("bedDoctorResume mapBedVsQueue DONOT existed OR NOT Paused. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
@@ -194,7 +199,7 @@
}
public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
if (null == bedQueueBO) {
log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
@@ -215,7 +220,7 @@
}
public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
- BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bedQueueBO = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
if (null == bedQueueBO) {
log.error("bedDoctorOff mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
@@ -237,9 +242,10 @@
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());
// 璇ュ伐浣� 娌℃湁 [灏辫瘖鍑嗗涓璢 浜哄憳
@@ -248,7 +254,28 @@
}
// 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
- BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
+ bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
+
+ refreshPriorityQueue(bo);
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+ */
+
+ // 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
+ public ErrorCode nextPatient(Long roomId, String bedNo) {
+ QueueDO firstReadyQueueItem = queueMapper.getFirstItemByBedAndStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
+ // 璇ュ伐浣� 娌℃湁 [灏辫瘖鍑嗗涓璢 浜哄憳
+ if (null == firstReadyQueueItem) {
+ return QUEUE_NOT_READY_PATIENT;
+ }
+
+ // QueueStatusEnum.READY => QueueStatusEnum.ONSTAGE
+ firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
+ queueMapper.updateById( firstReadyQueueItem );
+
+ // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
+ BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
refreshPriorityQueue(bo);
@@ -257,17 +284,33 @@
// 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ 鐨勪汉 璁剧疆涓� [瀹夎涓璢
- Integer updateNum = queueMapper.preemptReceivedPatient(roomId, bedNo,
- QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.INSTALLING.getStatus());
- // 璇ュ伐浣� 娌℃湁 [宸查鐢╙ 浜哄憳
- if (null == updateNum || 0 == updateNum) {
+ // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ [宸插彫鍥�-瀹夎] 鐨勪汉 璁剧疆涓� [瀹夎涓璢
+ QueueDO firstItem = queueMapper.getFirstItemByRoomAndStatus(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 );
+ queueMapper.updateById( firstItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = getCheckTypeItem( firstItem.getBookCheckType() );
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstItem.getPatId(),
+ checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.RECEIVED.getStatus());
+ for (int i = 0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ queueItem.setStatus(QueueStatusEnum.AFFINITY_RECEIVED.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+ queueItem.setBedNo( bedNo ); // 璺熼殢鍒� 瑁呮満 宸ヤ綅
+ queueMapper.updateById(queueItem);
+ }
}
// 瑁呮満宸ヤ綅 鏃犱紭鍏堥槦鍒�
// 浼樺厛闃熷垪涓� 璇ュ伐浣� [宸查鐢╙浜虹殑鏁伴噺 鍑忎竴
- //BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ //BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
//bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
//refreshPriorityQueue(bo);
@@ -296,7 +339,7 @@
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
// 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
@@ -308,7 +351,7 @@
throw new RuntimeException("init: exceed max queue number!");
item.queueNum.set( queueNum );
- mapBedVsQueue.put(String.format("%09d%s", item.roomId, item.bedNo), item);
+ mapBedVsQueue.put( Utils.formatRoomBed(item.roomId, item.bedNo), item);
if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) {
addPriorityQueue(item);
}
@@ -359,7 +402,7 @@
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
curSeqNum.get() + 1,
- QueueStatusEnum.RECALLED.getStatus(),
+ QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 娌℃湁浼樺厛闃熷垪
QueueStatusEnum.READY.getStatus());
if (null == updateNum || 0 == updateNum)
break;
@@ -411,6 +454,23 @@
return;
}
+ // 鎶㈠埌鎺掗槦鎮ｈ�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ 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(queueDO.getRoomId());
+ queueItem.setRoomName(queueDO.getRoomName());
+ queueItem.setBedNo(queueDO.getBedNo());
+ queueItem.setSeqNum(curSeqNum.get() + 1); // 浣跨敤鍚屼竴涓� 鍐呴儴搴忓彿
+ queueMapper.updateById(queueItem);
+ }
+ }
+
curSeqNum.getAndIncrement();
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
@@ -434,8 +494,12 @@
mapCheckTypeVsReadyMax = checkTypeDOList.stream().collect(Collectors.toMap(CheckTypeDO::getValue, checkType -> checkType));
}
+ public CheckTypeDO getCheckTypeItem(Integer checkType) {
+ return mapCheckTypeVsReadyMax.get( checkType );
+ }
+
public BedQueueBO getBedQueueBO(Long roomId, String bedNo) {
- return mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ return mapBedVsQueue.get( Utils.formatRoomBed(roomId, bedNo) );
}
public MonitorInfoVO getMonitorInfo() {
@@ -555,6 +619,7 @@
monitorInfoVO.setQueueNum(mapBedVsQueue.size());
monitorInfoVO.setActiveQueueNum((int) mapBedVsQueue.values().stream().filter(item -> item.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus()).count());
monitorInfoVO.setPriorityQueueNum( hashSetOperatingBedQueue.size() );
+ monitorInfoVO.setMapBedVsQueue( mapBedVsQueue );
}
}
--
Gitblit v1.9.3