From dc90adfdd8b5efe8368d831e8fd5c89002c92b68 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 29 十月 2024 16:03:12 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 54 insertions(+), 1 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index 16c0648..017e0c1 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -1,5 +1,20 @@
 package cn.lihu.jh.module.ecg.controller.admin.appointment;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.util.date.DateUtils;
+import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.DevRentSaveReqVO;
+import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.feign.RemoteDataService;
+import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
+import cn.lihu.jh.module.ecg.feign.RestApiResult;
+import cn.lihu.jh.module.ecg.feign.dto.AppointmentExternal;
+import cn.lihu.jh.module.ecg.service.devrent.DevRentService;
+import cn.lihu.jh.module.ecg.service.queue.QueueService;
+import cn.lihu.jh.module.ecg.service.room.RoomService;
+import cn.lihu.jh.module.system.api.dept.DeptApi;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -7,19 +22,28 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 import cn.lihu.jh.framework.common.pojo.PageParam;
 import cn.lihu.jh.framework.common.pojo.PageResult;
 import cn.lihu.jh.framework.common.pojo.CommonResult;
 import cn.lihu.jh.framework.common.util.object.BeanUtils;
+
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
 import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
 
 import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
 
 import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
+import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
 
 import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
 import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
@@ -37,6 +61,18 @@
 
     @Resource
     private AppointmentService appointmentService;
+
+    @Resource
+    private QueueService queueService;
+
+    @Resource
+    private RoomService roomService;
+
+    @Resource
+    private DevRentService devRentService;
+
+    @Resource
+    private DeptApi deptApi;
 
     @PostMapping("/create")
     @Operation(summary = "鍒涘缓棰勭害")
@@ -71,6 +107,15 @@
         return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
     }
 
+    @GetMapping("/get-by-patient")
+    @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鑾峰緱棰勭害")
+    @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+    public CommonResult<AppointmentRespVO> getAppointmentByPatient(@RequestParam("patId") String patId) {
+        AppointmentDO appointment = appointmentService.getAppointmentByPatId( patId );
+        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "鑾峰緱棰勭害鍒嗛〉")
     @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
@@ -92,4 +137,12 @@
                         BeanUtils.toBean(list, AppointmentRespVO.class));
     }
 
-}
\ No newline at end of file
+    @PostMapping("/confirm")
+    @Operation(summary = "棰勭害纭")
+    @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
+    public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
+        appointmentService.appoitmentConfirm( confirmReqVO );
+        return success("纭鎴愬姛");
+    }
+
+}

--
Gitblit v1.9.3