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/QueueServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
index 26adc4c..477871b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -6,6 +6,7 @@
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.devrent.DevRentDO;
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
@@ -317,7 +318,28 @@
@Override
@Transactional
public void queue(QueueSaveReqVO queueSaveReqVO) {
- queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
+ queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //榛樿鐘舵��: 鎺掗槦涓�
+
+ // 澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( queueSaveReqVO.getBookCheckType() );
+ if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckItems(queueSaveReqVO.getPatId(), checkTypeDO.getAffinityCheckTypes());
+ //List<Integer> affinityItemIDs = affinityItems.stream().map(queueItem -> queueItem.getId()).toList();
+ //queueSaveReqVO.setAffinityItems(affinityItemIDs);
+
+ for (int i=0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ if (QueueStatusEnum.READY.getStatus() == queueItem.getStatus()
+ || QueueStatusEnum.ONSTAGE.getStatus() == queueItem.getStatus()) {
+ queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY_ALREADY.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+ queueSaveReqVO.setRoomId(queueItem.getRoomId());
+ queueSaveReqVO.setRoomName(queueItem.getRoomName());
+ queueSaveReqVO.setBedNo(queueItem.getBedNo());
+ break;
+ }
+ }
+ }
+
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
@@ -337,7 +359,7 @@
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
// 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
if ( num != null && num > 0)
@@ -354,7 +376,7 @@
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
// 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
if ( num != null && num > 0)
@@ -371,7 +393,7 @@
// QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
// 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
if ( num != null && num > 0)
@@ -397,13 +419,13 @@
startNextPatient(roomId, bedNo);
}
- public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
+ public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Integer> statusList) {
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, statusList);
return queueDOList;
}
@Override
- public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Byte> statusList) {
+ public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Integer> statusList) {
List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
return queueDOList;
}
@@ -425,7 +447,7 @@
// 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲�
RoomDO roomDO = getRoomDO(roomId, bedNo);
Integer[] checkTypes = roomDO.getCheckTypes();
- List<Byte> statusList = new ArrayList<>();
+ List<Integer> statusList = new ArrayList<>();
statusList.add(QueueStatusEnum.WAITING.getStatus());
Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList);
patientStatisticVO.setQueuingNum(num);
@@ -483,7 +505,7 @@
// 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲�
RoomDO roomDO = getRoomDO(roomId, bedNo);
Integer[] checkTypes = roomDO.getCheckTypes();
- List<Byte> statusList = new ArrayList<>();
+ List<Integer> statusList = new ArrayList<>();
statusList.add(QueueStatusEnum.WAITING.getStatus());
Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList);
patientStatisticVO.setQueuingNum(num);
@@ -539,9 +561,15 @@
return roomMapper.getRoomByDocId(docId);
}
+ /**
+ * 鑾峰彇 鎸囧畾宸ヤ綅 寰呮鏌寰呴鐢ㄧ殑浜�
+ * @param roomId
+ * @param bedNo
+ * @return
+ */
@Override
public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) {
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
queueStatusList.add(QueueStatusEnum.READY.getStatus());
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
@@ -552,7 +580,7 @@
@Override
public List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo) {
- List<Byte> queueStatusList = new ArrayList<>();
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList);
--
Gitblit v1.9.3