From 7b837906c9d313db64557593adf3f4a4eaac9fb2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 30 八月 2024 18:01:29 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 8db650a..a563539 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,6 +1,8 @@
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.queue.vo.QueueSaveReqVO;
import cn.lihu.jh.module.ecg.feign.RemoteDataService;
import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
@@ -9,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;
@@ -27,6 +30,8 @@
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
@@ -180,15 +185,25 @@
//TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
- QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
- queueSaveReqVO.setPatId( appointment.getPatId());
- queueSaveReqVO.setPatName( appointment.getPatName() );
- queueSaveReqVO.setPatGender( appointment.getPatGender());
- queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
- queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
- queueSaveReqVO.setPassed((byte)0);
- queueSaveReqVO.setExpired((byte)0);
- queueService.queue(queueSaveReqVO);
+/* TODO for Testing
+ if ( !DateUtils.isToday(appointment.getBookDate()) )
+ return error( new ErrorCode(101, "涓嶆槸浠婂ぉ鐨勯绾︾敤鎴�"));
+*/
+
+ 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");
}
--
Gitblit v1.9.3