From 12c97309b50530c8c7f9c6d48641c79d07a44b2b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 30 十月 2024 17:18:49 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 80 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 8 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 3f92d62..b496554 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,33 +1,57 @@
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 jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
+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;
import cn.lihu.jh.module.ecg.service.appointment.AppointmentService;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
@Tag(name = "绠＄悊鍚庡彴 - 棰勭害")
@RestController
@@ -38,10 +62,22 @@
@Resource
private AppointmentService appointmentService;
+ @Resource
+ private QueueService queueService;
+
+ @Resource
+ private RoomService roomService;
+
+ @Resource
+ private DevRentService devRentService;
+
+ @Resource
+ private DeptApi deptApi;
+
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰勭害")
@PreAuthorize("@ss.hasPermission('ecg:appointment:create')")
- public CommonResult<Integer> createAppointment(@Valid @RequestBody AppointmentSaveReqVO createReqVO) {
+ public CommonResult<Long> createAppointment(@Valid @RequestBody AppointmentSaveReqVO createReqVO) {
return success(appointmentService.createAppointment(createReqVO));
}
@@ -57,7 +93,7 @@
@Operation(summary = "鍒犻櫎棰勭害")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('ecg:appointment:delete')")
- public CommonResult<Boolean> deleteAppointment(@RequestParam("id") Integer id) {
+ public CommonResult<Boolean> deleteAppointment(@RequestParam("id") Long id) {
appointmentService.deleteAppointment(id);
return success(true);
}
@@ -66,8 +102,28 @@
@Operation(summary = "鑾峰緱棰勭害")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
- public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Integer id) {
+ public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Long id) {
AppointmentDO appointment = appointmentService.getAppointment(id);
+ 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("/query-his-by-patient")
+ @Operation(summary = "浠嶩IS.鏌ヨ鎮ｈ�呴绾�/寮�鍗曚俊鎭�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<AppointmentRespVO> queryHisByPatient(@RequestParam("patId") String patId) {
+ AppointmentDO appointment = appointmentService.getAppointmentExtermal( patId );
+ if ( null == appointment)
+ return error(APPOINTMENT_NOT_BILLING);
return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
}
@@ -92,4 +148,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