From 913587c63ac1a475b37e21b7f1fa160a23a286ef Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 06 十一月 2024 18:16:02 +0800
Subject: [PATCH] 检查类型相关
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 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 b496554..fa03b89 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,20 +1,9 @@
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;
@@ -22,12 +11,8 @@
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;
@@ -42,8 +27,6 @@
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;
@@ -107,12 +90,21 @@
return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
}
- @GetMapping("/get-by-patient")
- @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鑾峰緱棰勭害")
+ @GetMapping("/get-current-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 );
+ 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));
}
@@ -121,10 +113,10 @@
@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)
+ List<AppointmentDO> appointmentList = appointmentService.getAppointmentExtermal( patId );
+ if ( 0 == appointmentList.size() )
return error(APPOINTMENT_NOT_BILLING);
- return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+ return success(BeanUtils.toBean(appointmentList.get(0), AppointmentRespVO.class));
}
@GetMapping("/page")
--
Gitblit v1.9.3