From cbfab93f4977c7f737938ffb4534560c4a003197 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 09 九月 2024 18:23:41 +0800
Subject: [PATCH] 作业记录功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 30 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 ce97709..daa8274 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,15 +1,12 @@
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.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.queue.QueueService;
@@ -21,13 +18,11 @@
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.exception.enums.GlobalErrorCodeConstants.SUCCESS;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
@Tag(name = "绠＄悊鍚庡彴 - 鍖荤敓鍙彿")
@@ -39,11 +34,92 @@
@Resource
private QueueService queueService;
+ @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 = "瀹屾垚銆佷笅涓�浣嶆偅鑰�")
@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)
@@ -62,7 +138,7 @@
@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)
@@ -81,7 +157,7 @@
@Operation(summary = "鍙栨偅鑰呭垪琛�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:patientlist')")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<List<QueueRespVO>> getPatientList(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
@@ -98,7 +174,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)
@@ -107,30 +183,21 @@
return success(patientStatisticVO);
}
- @GetMapping("/passed-patient-return")
- @Operation(summary = "杩囨湡鐥呬汉鍥炴潵")
+ @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:patient')")
- public CommonResult<String> passedPatientReturn(
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> recallPatient(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo,
@RequestParam("patId") String patId )
{
- Integer result = queueService.passedPatientReturn(roomId, bedNo, patId);
- return success("success");
- }
+ Integer result = queueService.recallPatient(roomId, bedNo, patId);
+ if (null == result || 0 == result)
+ return error( new ErrorCode(201, "鎵句笉鍒版偅鑰�") );
- @GetMapping("/queuejump")
- @Operation(summary = "鎻掗槦")
- @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:patient')")
- public CommonResult<String> queueJump(
- @RequestParam("patId") String patId,
- @RequestParam("jumpFlag") Byte jumpFlag)
- {
- Integer result = queueService.queueJump(patId, jumpFlag);
return success("success");
}
--
Gitblit v1.9.3