From 9f526928de4a81a09f744e25f37daca77d3a10a8 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 16:19:58 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 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 a987611..b42bf7b 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
@@ -1,34 +1,33 @@
package cn.lihu.jh.module.ecg.service.queue;
-import cn.lihu.jh.framework.common.exception.ErrorCode;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Resource;
+
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
-import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
-import cn.lihu.jh.module.ecg.enums.ErrorCodeConstants;
-import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
-import cn.lihu.jh.module.infra.api.config.ConfigApi;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.pojo.CommonResult;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
+import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
+import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.infra.api.config.ConfigApi;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
-
-import javax.annotation.Resource;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.lihu.jh.module.ecg.Constants.ECG_OPENING_TIME_KEY;
-import static cn.lihu.jh.module.ecg.Constants.ECG_QUEUE_READY_MAX_KEY;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -201,7 +200,7 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.CLOSED);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
@@ -231,7 +230,6 @@
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);
@@ -240,11 +238,28 @@
statusList.add(BedStatusEnum.OPENING);
statusList.add(BedStatusEnum.DOCTOR_ON);
statusList.add(BedStatusEnum.PAUSE);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, destStatusEnum, statusList);
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
+ BedStatusEnum.CLOSED, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
return SUCCESS;
+ }
+
+ @Override
+ public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO) {
+ return error(QUEUE_BED_ABNORMAL);
+ }
+
+ RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+ if (null == roomDO) {
+ return error(ECG_INNER_ERROR);
+ }
+
+ RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
+ return success(roomRespVO);
}
@Override
@@ -284,6 +299,7 @@
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+ hurryup();
return SUCCESS;
}
@@ -391,7 +407,7 @@
for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.procPassedReturnPatient(
+ Integer updateNum = queueMapper.queuePassedReturnPatient(
bedQueueBO.getRoomId(),
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
@@ -551,7 +567,7 @@
@Override
public Integer recallPatient(Long roomId, String bedNo, String patId) {
- Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
+ Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
startHurryUp();
return updateNum;
--
Gitblit v1.9.3