From 6bef82df447efb08d05ad3d0c45585ef9b0acdb7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 01 十一月 2024 16:48:35 +0800
Subject: [PATCH] 支持 feign 处理 content-type [text/plain] 返回内容
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 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 8c1a4a5..012c5e6 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,9 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment;
+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.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,12 +18,15 @@
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 cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
@@ -38,10 +45,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 +76,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 +85,37 @@
@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-current-by-patient")
+ @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鏌ヨ褰撳ぉ棰勭害")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<AppointmentRespVO> getCurAppointmentByPatId(@RequestParam("patId") String patId) {
+ AppointmentDO appointment = appointmentService.getCurAppointmentByPatId( patId );
+ return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+ }
+
+ @GetMapping("/query-and-create-by-patient")
+ @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鑾峰緱棰勭害.骞跺唴閮ㄥ垱寤洪绾�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<AppointmentRespVO> queryAndCreateAppointmentByPatId(@RequestParam("patId") String patId) {
+ AppointmentDO appointment = appointmentService.queryAndCreateAppointmentByPatId( 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));
}
@@ -96,9 +144,8 @@
@Operation(summary = "棰勭害纭")
@PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
- //TODO 澶勭悊鎺掗槦閫昏緫
- //AppointmentDO appointment = appointmentService.getAppointment(id);
- //return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
- return success("hello");
+ appointmentService.appoitmentConfirm( confirmReqVO );
+ return success("纭鎴愬姛");
}
+
}
--
Gitblit v1.9.3