From bb767d9be029935ee73b4a8e67b370a153f39c74 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 31 八月 2024 09:58:06 +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, 11 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 f6ca95c..5c80db5 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
@@ -267,9 +267,6 @@
if (bedQueueBO.getQueueNum().get() >0)
return QUEUE_HAVE_PATIENT;
- mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
- priorityQueue.remove(bedQueueBO);
-
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.OPENING);
@@ -280,6 +277,8 @@
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+ mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
+ priorityQueue.remove(bedQueueBO);
return SUCCESS;
}
@@ -292,6 +291,7 @@
RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
if (null == roomDO) {
+ System.out.println("getRoom ========");
return error(ECG_INNER_ERROR);
}
@@ -305,17 +305,16 @@
if (null == bedQueueBO)
return QUEUE_BED_ABNORMAL;
- bedQueueBO.setStatusEnum(BedStatusEnum.PAUSE);
- priorityQueue.remove(bedQueueBO);
-
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName,
+ Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId,
BedStatusEnum.PAUSE, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+ bedQueueBO.setStatusEnum(BedStatusEnum.PAUSE);
+ priorityQueue.remove(bedQueueBO);
return SUCCESS;
}
@@ -325,16 +324,16 @@
if (null == bedQueueBO)
return QUEUE_BED_ABNORMAL;
- bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
- priorityQueue.offer(bedQueueBO);
-
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.PAUSE);
- Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName,
+ Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId,
BedStatusEnum.DOCTOR_ON, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
+ priorityQueue.offer(bedQueueBO);
hurryup();
return SUCCESS;
@@ -368,7 +367,7 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId, docName,
+ Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId,
BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
--
Gitblit v1.9.3