From 3e696d457f13338a7eb5ad0935a7d2c7affcf605 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 23 八月 2024 11:02:36 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 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 c444d26..fa91b33 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,14 +1,10 @@ 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.module.ecg.controller.admin.queue.vo.QueuePageReqVO; +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.dal.dataobject.queue.QueueDO; import cn.lihu.jh.module.ecg.enums.QueueStatusEnum; import cn.lihu.jh.module.ecg.service.queue.QueueService; @@ -20,13 +16,10 @@ 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 static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.lihu.jh.framework.common.pojo.CommonResult.error; import static cn.lihu.jh.framework.common.pojo.CommonResult.success; @Tag(name = "绠$悊鍚庡彴 - 鍖荤敓鍙彿") @@ -93,4 +86,35 @@ return success(BeanUtils.toBean(queueDOList, QueueRespVO.class)); } + @GetMapping("/get-patient-statistic") + @Operation(summary = "鍙栨偅鑰呯粺璁�") + @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116") + @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2") + @PreAuthorize("@ss.hasPermission('ecg:doctor:patientstatistic')") + public CommonResult<PatientStatisticVO> getPatientStatistic( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo) + { + PatientStatisticVO patientStatisticVO = queueService.getPatientStatistic(roomId, bedNo); + return success(patientStatisticVO); + } + + @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 = "鎮h�呯紪鍙�", required = true, example = "B2") + @PreAuthorize("@ss.hasPermission('ecg:doctor:patient')") + public CommonResult<String> recallPatient( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo, + @RequestParam("patId") String patId ) + { + Integer result = queueService.recallPatient(roomId, bedNo, patId); + if (null == result || 0 == result) + return error( new ErrorCode(201, "鎵句笉鍒版偅鑰�") ); + + return success("success"); + } + } -- Gitblit v1.9.3