From 11e73608f1a558c094811aae97a5bccd60317bc2 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 13 十一月 2024 10:24:34 +0800 Subject: [PATCH] Fix Bug: 工位 准备中数量 不对 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java index 6d62b73..3db4f8a 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java @@ -2,7 +2,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; import cn.lihu.jh.framework.common.exception.ErrorCode; import cn.lihu.jh.framework.common.pojo.CommonResult; @@ -64,6 +63,7 @@ ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName); ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName); ErrorCode startNextPatient(Long roomId, String bedNo); + ErrorCode startNextInstallPatient(Long roomId, String bedNo); CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId); @@ -90,22 +90,49 @@ void queue(QueueSaveReqVO queueSaveReqVO); /** - * 鍖荤敓鍙笅涓�浣嶆偅鑰� + * 甯歌妫�鏌� 鍖荤敓鍙笅涓�浣嶆偅鑰� */ void finishNextPatient(Long roomId, String bedNo); /** - * 鍖荤敓鐪嬪畬鎮h�� + * 棰嗙敤 鍖荤敓鍙笅涓�浣嶆偅鑰� + */ + void finishReceiveNextPatient(Long roomId, String bedNo); + + /** + * 瑁呮満 鍖荤敓鍙笅涓�浣嶆偅鑰� + */ + void finishInstallNextPatient(Long roomId, String bedNo); + + /** + * 甯歌杩囧彿銆侀鐢ㄨ繃鍙� */ void passNextPatient(Long roomId, String bedNo); - List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList); + /** + * 瑁呮満杩囧彿 + */ + void passInstallNextPatient(Long roomId, String bedNo); + + List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Integer> statusList); + + List<QueueDO> getRoomQueueByStatus(Long roomId, List<Integer> statusList); PatientStatisticVO getPatientStatistic(Long roomId, String bedNo); + PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo); + + PatientStatisticVO getBedDevInstallStatistic(Long roomId, String bedNo); + Integer recallPatient(Long roomId, String bedNo, String patId); + + Integer recallInstallPatient(Long roomId, String bedNo, String patId); Integer patientJump(String patId, Byte jumped ); RoomDO getDocRoomInfo(Long docId); + + List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo); + + List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo); } -- Gitblit v1.9.3