From adb4da3c83649d550b8674feb1eb0926fbace30e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 11 十一月 2024 13:45:12 +0800
Subject: [PATCH] 排队&抢人时 亲和检查项目处理
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 a7dc7b6..7fede40 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
@@ -16,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;
@@ -29,6 +30,7 @@
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
+import static cn.lihu.jh.module.ecg.Constants.*;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -40,6 +42,9 @@
@Validated
@Slf4j
public class QueueServiceTxFunctions {
+
+ @Resource
+ private ConfigApi configApi;
@Resource
private OAuth2TokenApi oAuth2TokenApi;
@@ -95,7 +100,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);
@@ -126,7 +131,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());
@@ -240,7 +245,7 @@
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [灏辫瘖鍑嗗涓璢 鐨勪汉 璁剧疆涓� [灏辫瘖涓璢 (鎴栭鐢ㄤ腑)
+ // 浠� DB 鎶婅宸ヤ綅.搴忓彿鏈�灏忕殑 [灏辫瘖鍑嗗涓璢 鐨勪汉 璁剧疆涓� [灏辫瘖涓璢 (鎴栭鐢ㄤ腑)
Integer updateNum = queueMapper.updateBedQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
// 璇ュ伐浣� 娌℃湁 [灏辫瘖鍑嗗涓璢 浜哄憳
@@ -259,8 +264,9 @@
// 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ 鐨勪汉 璁剧疆涓� [瀹夎涓璢
- Integer updateNum = queueMapper.preemptReceivedPatient(roomId, bedNo,
- QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.INSTALLING.getStatus());
+ Integer updateNum = queueMapper.preemptToBeInstalledPatient(roomId, bedNo,
+ List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()),
+ QueueStatusEnum.INSTALLING.getStatus());
// 璇ュ伐浣� 娌℃湁 [宸查鐢╙ 浜哄憳
if (null == updateNum || 0 == updateNum) {
return QUEUE_NOT_READY_PATIENT;
@@ -297,7 +303,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);
@@ -360,7 +366,7 @@
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
curSeqNum.get() + 1,
- QueueStatusEnum.RECALLED.getStatus(),
+ QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 娌℃湁浼樺厛闃熷垪
QueueStatusEnum.READY.getStatus());
if (null == updateNum || 0 == updateNum)
break;
@@ -412,6 +418,20 @@
return;
}
+ // 鎶㈠埌鎺掗槦鎮ｈ�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ QueueDO queueDO = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ CheckTypeDO checkTypeDO = getCheckTypeItem( queueDO.getBookCheckType() );
+ if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckItems(queueDO.getPatId(), checkTypeDO.getAffinityCheckTypes());
+ for (int i = 0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ queueItem.setStatus(QueueStatusEnum.AFFINITY_ALREADY.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+ queueItem.setRoomId(queueItem.getRoomId());
+ queueItem.setRoomName(queueItem.getRoomName());
+ queueItem.setBedNo(queueItem.getBedNo());
+ }
+ }
+
curSeqNum.getAndIncrement();
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
@@ -435,6 +455,10 @@
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( Utils.formatRoomBed(roomId, bedNo) );
}
--
Gitblit v1.9.3