From 66fd4f82f8567454d0b93cfe6e519801857d156a Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 23 七月 2026 14:37:53 +0800
Subject: [PATCH] 新增停止
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
index e89911a..142830f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
@@ -7,6 +7,7 @@
import cn.lihu.jh.module.ecg.controller.admin.call.vo.CallSaveReqVO;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.PatientStatisticVO;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueRespVO;
+import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
@@ -54,8 +55,10 @@
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
- if (result.equals(SUCCESS))
+ if (result.equals(SUCCESS)) {
+ queueService.updateStop(roomId, bedNo);
return success(SUCCESS.getCode());
+ }
return error(result);
}
@@ -135,7 +138,7 @@
{
queueService.finishNextPatient(roomId, bedNo);
- List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+ List<QueueDO> queueDOList = queueService.getCheckRelatedPatient(roomId, bedNo);
// 杩囨护鍑� 灏辫瘖涓殑锛屽噯澶囧彨鍙�
QueueDO onStageItem = queueDOList.stream().filter(item ->
@@ -161,7 +164,7 @@
{
queueService.finishReceiveNextPatient(roomId, bedNo);
- List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+ List<QueueDO> queueDOList = queueService.getCheckRelatedPatient(roomId, bedNo);
// 杩囨护鍑� 灏辫瘖涓殑锛屽噯澶囧彨鍙�
QueueDO onStageItem = queueDOList.stream().filter(item ->
@@ -187,14 +190,14 @@
{
queueService.finishInstallNextPatient(roomId, bedNo);
- List<QueueDO> queueDOList = queueService.getToBeInstalledPatient(roomId, bedNo); // 寰呭畨瑁呯殑鎮ｈ��
+ List<QueueDO> queueDOList = queueService.getInstallRelatedPatient(roomId, bedNo); // 寰呭畨瑁呯殑鎮ｈ��
List<QueueDO> installingQueueDOList = queueDOList.stream().filter(queueDO ->
queueDO.getStatus() == QueueStatusEnum.INSTALLING.getStatus() && queueDO.getAffinityItem() == 0
).toList();
// 杩囨护鍑� [瀹夎涓璢 鐨勶紝鍑嗗鍙彿 璇ュ伐浣嶅簲璇� 鏈�澶氬彧鏈変竴涓� [瀹夎涓璢
if (installingQueueDOList.size() > 0) {
- QueueDO onStageItem = installingQueueDOList.getFirst();
+ QueueDO onStageItem = installingQueueDOList.get(0);
CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
callSaveReqVO.setId(null);
callSaveReqVO.setCallType(1); // 瑁呮満鍙彿
@@ -230,7 +233,7 @@
{
queueService.passNextPatient(roomId, bedNo);
- List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+ List<QueueDO> queueDOList = queueService.getCheckRelatedPatient(roomId, bedNo);
// 杩囨护鍑� 灏辫瘖涓殑锛屽噯澶囧彨鍙�
QueueDO onStageItem = queueDOList.stream().filter(item -> Objects.equals(item.getStatus(), QueueStatusEnum.ONSTAGE.getStatus())).findFirst().orElse(null);
@@ -254,12 +257,12 @@
{
queueService.passInstallNextPatient(roomId, bedNo);
- List<QueueDO> queueDOList = queueService.getToBeInstalledPatient(roomId, bedNo);
+ List<QueueDO> queueDOList = queueService.getInstallRelatedPatient(roomId, bedNo);
List<QueueDO> installingQueueDOList = queueDOList.stream().filter(queueDO -> queueDO.getStatus() == QueueStatusEnum.INSTALLING.getStatus()).toList();
// 杩囨护鍑� [瀹夎涓璢 鐨勶紝鍑嗗鍙彿 璇ュ伐浣嶅簲璇� 鏈�澶氬彧鏈変竴涓� [瀹夎涓璢
if (installingQueueDOList.size() > 0) {
- QueueDO onStageItem = installingQueueDOList.getFirst();
+ QueueDO onStageItem = installingQueueDOList.get(0);
CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
callSaveReqVO.setId(null);
callSaveReqVO.setCallType(1); // 瑁呮満鍙彿
@@ -338,7 +341,7 @@
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
- List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+ List<QueueDO> queueDOList = queueService.getCheckRelatedPatient(roomId, bedNo);
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
@@ -351,7 +354,7 @@
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
- List<QueueDO> queueDOList = queueService.getToBeInstalledPatient(roomId, bedNo);
+ List<QueueDO> queueDOList = queueService.getInstallRelatedPatient(roomId, bedNo);
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
--
Gitblit v1.9.3