From eec1528a3c4f10c6096cbeadf2a7ef9104e8ec4b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 23 十月 2024 22:13:37 +0800
Subject: [PATCH] 检查类型 简单列表接口
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 4956792..fd5e59d 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,14 @@
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;
@@ -69,6 +72,9 @@
private RemoteDataService remoteDataService;
@Resource
+ private DevRentService devRentService;
+
+ @Resource
private DeptApi deptApi;
@PostMapping("/create")
@@ -101,6 +107,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,10 +181,10 @@
+ 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);
+ queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus());
queueSaveReqVO.setPassed((byte)0);
queueSaveReqVO.setExpired((byte)0);
@@ -185,6 +200,8 @@
public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
//TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
+ if (null == appointment)
+ return error(PATIENT_NOT_EXISTS);
if ( !DateUtils.isToday(appointment.getBookDate()) )
return error( APPOINTMENT_NOT_TODAY);
@@ -199,11 +216,12 @@
queueSaveReqVO.setBookCheckType(appointment.getBookCheckType());
queueSaveReqVO.setPassed((byte) 0);
queueSaveReqVO.setExpired((byte) 0);
+ queueSaveReqVO.setPatDetails( appointment.getPatDeptDesc() + "-" + appointment.getPatWardDesc() + "-" + appointment.getPatBedNo());
queueService.queue(queueSaveReqVO);
} catch (DuplicateKeyException duplicateKeyException) {
return success("鎮ㄥ凡缁忓湪鎺掗槦涓簡");
}
- return success("hello");
+ return success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3