From 48e5224994cc500e6e0d898e7e9d3c8c9ad16062 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 20 八月 2024 15:31:49 +0800
Subject: [PATCH] 看完一个患者 功能

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 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 3caf902..785b45e 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
@@ -38,6 +38,25 @@
     @Resource
     private QueueService queueService;
 
+    @GetMapping("/finishpatient")
+    @Operation(summary = "涓嬩竴浣嶆偅鑰�")
+    @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
+    @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
+    @PreAuthorize("@ss.hasPermission('ecg:doctor:finishpatient')")
+    public CommonResult<List<QueueRespVO>> finishPatient(
+            @RequestParam("roomId") Long roomId,
+            @RequestParam("bedNo") String bedNo)
+    {
+        queueService.finishPatient(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);
+        return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+    }
+
     @GetMapping("/nextpatient")
     @Operation(summary = "涓嬩竴浣嶆偅鑰�")
     @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -55,22 +74,5 @@
         queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
         List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
         return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "鑾峰緱鎺掗槦鍒嗛〉")
-    @PreAuthorize("@ss.hasPermission('ecg:queue:query')")
-    public CommonResult<PageResult<QueueRespVO>> getqueuePage(@Valid QueuePageReqVO pageReqVO) {
-        PageResult<QueueDO> pageResult = queueService.getqueuePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, QueueRespVO.class));
-    }
-
-    @GetMapping("/opening-setting")
-    @Operation(summary = "寮�璇婅缃�")
-    @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
-    public CommonResult<Integer> openingSetting() {
-        queueService.initQueue();
-        queueService.hurryup();
-        return success(0);
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3