From c48f179be89343dc1620bfa147433bfe87d9bed3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 11 十一月 2024 17:29:50 +0800
Subject: [PATCH] 检查项-亲和性处理
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 d516f4d..89b3411 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;
@@ -197,7 +198,7 @@
e.printStackTrace();
}
- System.out.println("startBedDoctorOff ========");
+ //System.out.println("startBedDoctorOff ========");
return ECG_INNER_ERROR;
}
@@ -216,7 +217,7 @@
e.printStackTrace();
}
- System.out.println("startNextPatient ========");
+ //System.out.println("startNextPatient ========");
return ECG_INNER_ERROR;
}
@@ -317,7 +318,29 @@
@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.getCurPatGivenCheckTypes(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_WAITING.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+ queueSaveReqVO.setRoomId(queueItem.getRoomId());
+ queueSaveReqVO.setRoomName(queueItem.getRoomName());
+ queueSaveReqVO.setBedNo(queueItem.getBedNo());
+ queueSaveReqVO.setSeqNum(queueItem.getSeqNum());
+ break;
+ }
+ }
+ }
+
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
@@ -349,10 +372,6 @@
// 棰嗙敤 鍙彿
@Override
public void finishReceiveNextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� [灏辫瘖涓璢 鐨勪汉 璁剧疆涓� 銆愬凡棰嗙敤銆�
- //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
-
// 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
@@ -366,11 +385,7 @@
// 瑁呮満 鍙彿
@Override
public void finishInstallNextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� [瀹夎涓璢 鐨勪汉 璁剧疆涓� [宸插氨璇奭
- //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- // QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
-
- // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
+ // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [瀹夎涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
@@ -539,6 +554,12 @@
return roomMapper.getRoomByDocId(docId);
}
+ /**
+ * 鑾峰彇 鎸囧畾宸ヤ綅 寰呮鏌寰呴鐢ㄧ殑浜�
+ * @param roomId
+ * @param bedNo
+ * @return
+ */
@Override
public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) {
List<Integer> queueStatusList = new ArrayList<>();
--
Gitblit v1.9.3