From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 012c5e6..4b8f4a7 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
@@ -11,6 +11,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
+import java.time.LocalDate;
import java.util.*;
import java.io.IOException;
@@ -94,8 +95,9 @@
@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 );
+ public CommonResult<AppointmentRespVO> getCurAppointmentByPatId(@RequestParam("patId") String patId,
+ @RequestParam("checkType") Integer checkType) {
+ AppointmentDO appointment = appointmentService.getCurAppointmentByPatIdAndCheckType( patId, checkType );
return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
}
@@ -103,9 +105,9 @@
@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));
+ public CommonResult<List<AppointmentRespVO>> queryAndCreateAppointmentByPatId(@RequestParam("patId") String patId) {
+ List<AppointmentDO> appointmentDOList = appointmentService.queryAndCreateAppointmentByPatId( patId );
+ return success(BeanUtils.toBean(appointmentDOList, AppointmentRespVO.class));
}
@GetMapping("/query-his-by-patient")
@@ -113,10 +115,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")
@@ -143,9 +145,20 @@
@PostMapping("/confirm")
@Operation(summary = "棰勭害纭")
@PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
- public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
- appointmentService.appoitmentConfirm( confirmReqVO );
- return success("纭鎴愬姛");
+ public CommonResult<Integer> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
+ confirmReqVO.setIsVip(0);
+ Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO );
+ return success(newSeqNo);
+ }
+
+ @PostMapping("/confirm-vip")
+ @Operation(summary = "VIP棰勭害纭")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
+ public CommonResult<Integer> appointmentConfirmVip(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
+ confirmReqVO.setIsVip(1);
+ confirmReqVO.setBookDate( LocalDate.now() );
+ Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO );
+ return success(newSeqNo);
}
}
--
Gitblit v1.9.3