From a0cb526759c40821f0c98fab6dd24e4b8d4ba2c8 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 15 十月 2024 15:26:31 +0800 Subject: [PATCH] 装机叫号 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 16 +++++++++++++++- 1 files changed, 15 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 16070bd..0347684 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 @@ -3,11 +3,13 @@ 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.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; @@ -69,6 +71,9 @@ private RemoteDataService remoteDataService; @Resource + private DevRentService devRentService; + + @Resource private DeptApi deptApi; @PostMapping("/create") @@ -101,6 +106,15 @@ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')") public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Integer 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)); } @@ -166,7 +180,7 @@ + bookEndTime.getHour()*100 + bookEndTime.getMinute() ); //queueSaveReqVO.setBookCheckType( Byte.valueOf(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) ); - queueSaveReqVO.setBookCheckType( (byte)10 ); + queueSaveReqVO.setBookCheckType( 10 ); queueSaveReqVO.setSeqNum(1); queueSaveReqVO.setStatus((byte)10); -- Gitblit v1.9.3