From 687fc5cae46c915c8bcaccf59effcf4f4a8e75e0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 09:18:22 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 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 88e09de..eb40058 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
@@ -130,6 +130,24 @@
}
@Override
+ public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorResumeCallable(this, roomId, bedNo, docId, docName)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
Future<ErrorCode> future = singleThreadExecutor.submit(
new BedDoctorOnCallable(this, roomId, bedNo, docId, docName)
@@ -177,7 +195,6 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.CLOSED);
- statusList.add(BedStatusEnum.CLOSING);
Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum )
@@ -193,6 +210,7 @@
bedQueueBO.setBedNo(bedNo);
bedQueueBO.setMaxQueueNum(MAX_QUEUE_NUM);
bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
+ bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
priorityQueue.offer(bedQueueBO);
mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);
return SUCCESS;
@@ -204,13 +222,19 @@
if (null == bedQueueBO)
return QUEUE_BED_ABNORMAL;
+ if (bedQueueBO.getQueueNum().get() >0)
+ return QUEUE_HAVE_PATIENT;
+
+ BedStatusEnum destStatusEnum = destStatusEnum = BedStatusEnum.CLOSED;
+ mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
+ priorityQueue.remove(bedQueueBO);
+
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.OPENING);
statusList.add(BedStatusEnum.DOCTOR_ON);
statusList.add(BedStatusEnum.PAUSE);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
- BedStatusEnum.CLOSING, statusList);
+ Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, destStatusEnum, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
@@ -222,6 +246,29 @@
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
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,
+ BedStatusEnum.PAUSE, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ return SUCCESS;
+ }
+
+ @Override
+ public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO)
+ return QUEUE_BED_ABNORMAL;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
+ priorityQueue.offer(bedQueueBO);
// DB update
List statusList = new ArrayList<BedStatusEnum>();
@@ -248,6 +295,8 @@
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+ bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
+
return SUCCESS;
}
@@ -264,6 +313,8 @@
BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
return SUCCESS;
}
@@ -294,7 +345,11 @@
mapBedVsQueue.clear();
// 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃
- List<RoomDO> roomDOList = roomMapper.simpleRoomList();
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.OPENING);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
// 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
--
Gitblit v1.9.3