From ea1364fb67048883b2566d6320822a2d80560adf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 11 十一月 2024 20:00:46 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 477871b..77379f0 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
@@ -198,7 +198,7 @@
e.printStackTrace();
}
- System.out.println("startBedDoctorOff ========");
+ //System.out.println("startBedDoctorOff ========");
return ECG_INNER_ERROR;
}
@@ -217,7 +217,7 @@
e.printStackTrace();
}
- System.out.println("startNextPatient ========");
+ //System.out.println("startNextPatient ========");
return ECG_INNER_ERROR;
}
@@ -323,18 +323,17 @@
// 澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
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);
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypes(queueSaveReqVO.getPatId(), checkTypeDO.getAffinityCheckTypes());
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()); //鏀瑰彉 鎺掗槦鐘舵��
+ || 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;
}
}
@@ -371,10 +370,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());
@@ -388,11 +383,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);
--
Gitblit v1.9.3