From a9bfa2051eba0f8f1d1a8430292a89113f62b35f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 17:49:38 +0800
Subject: [PATCH] 拆机界面 设备详情显示
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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 ead467e..16070bd 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 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;
@@ -37,6 +38,7 @@
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;
@@ -183,23 +185,27 @@
public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
//TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
+ if (null == appointment)
+ return error(PATIENT_NOT_EXISTS);
-/* TODO for Testing
if ( !DateUtils.isToday(appointment.getBookDate()) )
- return error( new ErrorCode(101, "涓嶆槸浠婂ぉ鐨勯绾︾敤鎴�"));
-*/
+ return error( APPOINTMENT_NOT_TODAY);
- QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
- queueSaveReqVO.setPatId( appointment.getPatId());
- queueSaveReqVO.setPatName( appointment.getPatName() );
- queueSaveReqVO.setPatGender( appointment.getPatGender());
- queueSaveReqVO.setBookDate( appointment.getBookDate() );
- queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
- queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
- queueSaveReqVO.setPassed((byte)0);
- queueSaveReqVO.setExpired((byte)0);
- queueService.queue(queueSaveReqVO);
+ try {
+ QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
+ queueSaveReqVO.setPatId(appointment.getPatId());
+ queueSaveReqVO.setPatName(appointment.getPatName());
+ queueSaveReqVO.setPatGender(appointment.getPatGender());
+ queueSaveReqVO.setBookDate(appointment.getBookDate());
+ queueSaveReqVO.setBookTimeslot(appointment.getBookTimeslot());
+ queueSaveReqVO.setBookCheckType(appointment.getBookCheckType());
+ queueSaveReqVO.setPassed((byte) 0);
+ queueSaveReqVO.setExpired((byte) 0);
+ queueService.queue(queueSaveReqVO);
+ } catch (DuplicateKeyException duplicateKeyException) {
+ return success("鎮ㄥ凡缁忓湪鎺掗槦涓簡");
+ }
- return success("hello");
+ return success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3