From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 383 insertions(+), 32 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 006744d..e89911a 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
@@ -1,96 +1,357 @@
package cn.lihu.jh.module.ecg.controller.admin.doctor;
-import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.pojo.CommonResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
-import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
+import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+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.QueuePageReqVO;
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;
+import cn.lihu.jh.module.ecg.service.call.CallService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
-import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
+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.*;
@Tag(name = "绠＄悊鍚庡彴 - 鍖荤敓鍙彿")
@RestController
@RequestMapping("/ecg/doctor")
@Validated
+@Slf4j
public class DoctorController {
@Resource
private QueueService queueService;
+ @Resource
+ private CallService callService;
+
+ @GetMapping("/bed-doctor-pause")
+ @Operation(summary = "鍖荤敓鏆傚仠")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
+ public CommonResult<Integer> bedPause(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
+ return success(SUCCESS.getCode());
+
+ return error(result);
+ }
+
+ @GetMapping("/bed-doctor-resume")
+ @Operation(summary = "鍖荤敓鎭㈠")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
+ public CommonResult<Integer> bedResume(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ ErrorCode result = queueService.startBedDoctorResume(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
+ return success(SUCCESS.getCode());
+
+ return error(result);
+ }
+
+ @GetMapping("/bed-doctor-on")
+ @Operation(summary = "鍖荤敓鍏ュ骇")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
+ public CommonResult<Integer> bedDoctorOn(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ ErrorCode result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
+ return success(0);
+
+ return error(result);
+ }
+
+ @GetMapping("/bed-doctor-off")
+ @Operation(summary = "鍖荤敓绂诲骇")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
+ public CommonResult<Integer> bedDoctorOff(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ ErrorCode result = queueService.startBedDoctorOff(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
+ return success(SUCCESS.getCode());
+
+ return error(result);
+ }
+
+ @GetMapping("/bed-doctor-get")
+ @Operation(summary = "鍖荤敓宸ヤ綅鑾峰彇")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
+ public CommonResult<RoomRespVO> bedDoctorGet(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+
+ CommonResult<RoomRespVO> result = queueService.getRoom(roomId, bedNo, userId);
+ return result;
+ }
+
@GetMapping("/finish-next-patient")
- @Operation(summary = "瀹屾垚銆佷笅涓�浣嶆偅鑰�")
+ @Operation(summary = "甯歌鍙彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:nextpatient')")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<List<QueueRespVO>> finishNextPatient(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
queueService.finishNextPatient(roomId, bedNo);
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
+ List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+
+ // 杩囨护鍑� 灏辫瘖涓殑锛屽噯澶囧彨鍙�
+ QueueDO onStageItem = queueDOList.stream().filter(item ->
+ item.getStatus() == QueueStatusEnum.ONSTAGE.getStatus() && item.getAffinityItem() == 0
+ ).findFirst().orElse(null);
+ if (null != onStageItem) {
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callService.createCall(callSaveReqVO);
+ }
+
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
+ @GetMapping("/finish-receive-next-patient")
+ @Operation(summary = "棰嗙敤鍙彿銆佷笅涓�浣嶆偅鑰�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<List<QueueRespVO>> finishReceiveNextPatient(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ queueService.finishReceiveNextPatient(roomId, bedNo);
+
+ List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+
+ // 杩囨护鍑� 灏辫瘖涓殑锛屽噯澶囧彨鍙�
+ QueueDO onStageItem = queueDOList.stream().filter(item ->
+ item.getStatus() == QueueStatusEnum.ONSTAGE.getStatus() && item.getAffinityItem() == 0
+ ).findFirst().orElse(null);
+ if (null != onStageItem) {
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callService.createCall(callSaveReqVO);
+ }
+
+ return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ }
+
+ @GetMapping("/finish-install-next-patient")
+ @Operation(summary = "瑁呮満鍙彿銆佷笅涓�浣嶆偅鑰�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<List<QueueRespVO>> finishInstallNextPatient(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ queueService.finishInstallNextPatient(roomId, bedNo);
+
+ List<QueueDO> queueDOList = queueService.getToBeInstalledPatient(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();
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callSaveReqVO.setCallType(1); // 瑁呮満鍙彿
+ callService.createCall(callSaveReqVO);
+ }
+
+ return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ }
+
+ // 甯歌妫�鏌ヨ繃鍙枫�侀鐢ㄨ繃鍙�
+ @GetMapping("/pass-waiting-patient")
+ @Operation(summary = "杩囧彿鎺掗槦涓偅鑰�")
+ @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "20247845")
+ @Parameter(name = "checkType", description = "棰勭害妫�鏌ョ被鍨�", required = true, example = "100")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Integer> passWaitingPatient(
+ @RequestParam("patId") String patId,
+ @RequestParam("checkType") Integer checkType)
+ {
+ queueService.passWaitingPatient( patId, checkType );
+ return success(0);
+ }
+
+ // 甯歌妫�鏌ヨ繃鍙枫�侀鐢ㄨ繃鍙�
@GetMapping("/pass-next-patient")
@Operation(summary = "杩囧彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:nextpatient')")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<List<QueueRespVO>> passNextPatient(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
queueService.passNextPatient(roomId, bedNo);
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
+ List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+
+ // 杩囨护鍑� 灏辫瘖涓殑锛屽噯澶囧彨鍙�
+ QueueDO onStageItem = queueDOList.stream().filter(item -> Objects.equals(item.getStatus(), QueueStatusEnum.ONSTAGE.getStatus())).findFirst().orElse(null);
+ if (null != onStageItem) {
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callService.createCall(callSaveReqVO);
+ }
+
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
- @GetMapping("/get-patient-list")
- @Operation(summary = "鍙栨偅鑰呭垪琛�")
+ @GetMapping("/pass-install-next-patient")
+ @Operation(summary = "瀹夎杩囧彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:patientlist')")
- public CommonResult<List<QueueRespVO>> getPatientList(
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<List<QueueRespVO>> passInstallNextPatient(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ queueService.passInstallNextPatient(roomId, bedNo);
+
+ List<QueueDO> queueDOList = queueService.getToBeInstalledPatient(roomId, bedNo);
+
+ List<QueueDO> installingQueueDOList = queueDOList.stream().filter(queueDO -> queueDO.getStatus() == QueueStatusEnum.INSTALLING.getStatus()).toList();
+ // 杩囨护鍑� [瀹夎涓璢 鐨勶紝鍑嗗鍙彿 璇ュ伐浣嶅簲璇� 鏈�澶氬彧鏈変竴涓� [瀹夎涓璢
+ if (installingQueueDOList.size() > 0) {
+ QueueDO onStageItem = installingQueueDOList.getFirst();
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callSaveReqVO.setCallType(1); // 瑁呮満鍙彿
+ callService.createCall(callSaveReqVO);
+ }
+
+ return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ }
+
+ @GetMapping("/call-again")
+ @Operation(summary = "[甯歌妫�鏌鎴朳棰嗙敤] 閲嶅彨銆佹偅鑰�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> callPatientAgain(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
+ List<QueueDO> queueDOList = queueService.getBedQueueByStatus(roomId, bedNo, queueStatusList);
+
+ if (queueDOList.isEmpty())
+ return success("鏃犲氨璇婁腑鎮ｈ��");
+
+ if (queueDOList.size() > 1) {
+ log.error("room {} bed {} have {} 灏辫瘖涓偅鑰�", roomId, bedNo, queueDOList.size());
+ return error(ECG_INNER_ERROR);
+ }
+
+ QueueDO onStageItem = queueDOList.get(0);
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callService.callAgain(callSaveReqVO);
+
+ return success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @GetMapping("/call-install-again")
+ @Operation(summary = "閲嶅彨銆佹偅鑰�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> callInstallingPatientAgain(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ List<Integer> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
+ List<QueueDO> queueDOList = queueService.getBedQueueByStatus(roomId, bedNo, queueStatusList);
+
+ if (queueDOList.isEmpty())
+ return success("鏃犲畨瑁呬腑鐨勬偅鑰�");
+
+ if (queueDOList.size() > 1) {
+ log.error("room {} bed {} have {} 瀹夎涓殑鎮ｈ��", roomId, bedNo, queueDOList.size());
+ return error(ECG_INNER_ERROR);
+ }
+
+ QueueDO onStageItem = queueDOList.get(0);
+ CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
+ callSaveReqVO.setId(null);
+ callSaveReqVO.setCallType(1); // 瑁呮満鍙彿
+ callService.callAgain(callSaveReqVO);
+
+ return success("鎿嶄綔鎴愬姛");
+ }
+
+ @GetMapping("/get-to-be-checked-list")
+ @Operation(summary = "鍙� [甯歌妫�鏌 鎴� [寰呴鐢╙ 鎮ｈ�呭垪琛�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<List<QueueRespVO>> getToBeCheckedPatientList(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
+ return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ }
+
+ @GetMapping("/get-to-be-installed-list")
+ @Operation(summary = "鍙� [寰呭畨瑁匽 鎮ｈ�呭垪琛�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<List<QueueRespVO>> getToBeInstalledPatientList(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ List<QueueDO> queueDOList = queueService.getToBeInstalledPatient(roomId, bedNo);
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
@@ -98,7 +359,7 @@
@Operation(summary = "鍙栨偅鑰呯粺璁�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:patientstatistic')")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<PatientStatisticVO> getPatientStatistic(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
@@ -106,4 +367,94 @@
PatientStatisticVO patientStatisticVO = queueService.getPatientStatistic(roomId, bedNo);
return success(patientStatisticVO);
}
+
+ @GetMapping("/get-dev-ready-statistic")
+ @Operation(summary = "璁惧棰嗙敤缁熻")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<PatientStatisticVO> getDevReadyStatistic(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ PatientStatisticVO patientStatisticVO = queueService.getBedDevReadyStatistic(roomId, bedNo);
+ return success(patientStatisticVO);
+ }
+
+
+ @GetMapping("/get-dev-install-statistic")
+ @Operation(summary = "璁惧瑁呮満缁熻")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<PatientStatisticVO> getDevInstallStatistic(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ PatientStatisticVO patientStatisticVO = queueService.getBedDevInstallStatistic(roomId, bedNo);
+ return success(patientStatisticVO);
+ }
+
+ @GetMapping("/recall-pass-waiting-patient")
+ @Operation(summary = "杩囧彿-鎺掗槦涓� 鎮ｈ�呭彫鍥�")
+ @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
+ @Parameter(name = "checkType", description = "棰勭害妫�鏌ョ被鍨�", required = true, example = "100")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> recallPatient(
+ @RequestParam("patId") String patId,
+ @RequestParam("checkType") Integer checkType)
+ {
+ Integer result = queueService.recallPassWaitingPatient(patId, checkType);
+ if (null == result || 0 == result)
+ return error(PATIENT_NOT_EXISTS);
+
+ return success("鎿嶄綔鎴愬姛");
+ }
+
+ @GetMapping("/recall-patient")
+ @Operation(summary = "杩囧彿鐥呬汉鍙洖")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> recallPatient(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo,
+ @RequestParam("patId") String patId,
+ @RequestParam("checkType") Integer checkType,
+ @RequestParam("roomId_operator") Long roomId_operator,
+ @RequestParam("bedNo_operator") String bedNo_operator )
+ {
+ Integer result = queueService.recallPatient(roomId, bedNo, patId, checkType);
+ if (null == result || 0 == result)
+ return error(PATIENT_NOT_EXISTS);
+
+ return success("鎿嶄綔鎴愬姛");
+ }
+
+ @GetMapping("/recall-install-patient")
+ @Operation(summary = "杩囧彿瀹夎鐥呬汉鍙洖")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+ @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
+ @Parameter(name = "checkType", description = "妫�鏌ョ被鍨�", required = true, example = "100")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> recallInstallPatient(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo,
+ @RequestParam("patId") String patId,
+ @RequestParam("checkType") Integer checkType,
+ @RequestParam("roomId_operator") Long roomId_operator,
+ @RequestParam("bedNo_operator") String bedNo_operator )
+ {
+ if (roomId != roomId_operator)
+ return error(QUEUE_RECALL_INSTALL_NOT_CUR_ROOM);
+
+ Integer result = queueService.recallInstallPatient(roomId, bedNo, patId, checkType, roomId_operator, bedNo_operator);
+ if (null == result || 0 == result)
+ return error(PATIENT_NOT_EXISTS);
+
+ return success("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3