From e2efe712d2dc6593a03f71c6213f63a04437c3e7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 16:04:10 +0800
Subject: [PATCH] 显示设备详情
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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 574bae5..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
@@ -1,11 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment;
import cn.hutool.core.bean.BeanUtil;
-import cn.lihu.jh.framework.common.enums.CommonStatusEnum;
+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.dal.dataobject.queue.QueueDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
import cn.lihu.jh.module.ecg.feign.RemoteDataService;
import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
import cn.lihu.jh.module.ecg.feign.RestApiResult;
@@ -13,8 +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 cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
-import com.alibaba.fastjson.JSONObject;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,25 +20,25 @@
import io.swagger.v3.oas.annotations.Operation;
import java.time.LocalDateTime;
-import java.time.chrono.IsoChronology;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.ResolverStyle;
import java.util.*;
import java.io.IOException;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
import cn.lihu.jh.framework.common.pojo.PageParam;
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;
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;
@@ -176,8 +173,8 @@
queueSaveReqVO.setPassed((byte)0);
queueSaveReqVO.setExpired((byte)0);
- queueSaveReqVO.setRoomNum("-");
- queueSaveReqVO.setBedNum("-");
+ queueSaveReqVO.setRoomName("-");
+ queueSaveReqVO.setBedNo("-");
queueService.createqueue(queueSaveReqVO);
}
@@ -188,17 +185,27 @@
public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
//TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
+ if (null == appointment)
+ return error(PATIENT_NOT_EXISTS);
- 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);
+ if ( !DateUtils.isToday(appointment.getBookDate()) )
+ return error( APPOINTMENT_NOT_TODAY);
- return success("hello");
+ 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("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3