From 18f2eb72590ce5ff79693eb8a27188a499bbd114 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 29 十月 2024 16:12:53 +0800
Subject: [PATCH] appointment table key Integer -> Long
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
index 3f0de3d..577b98c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
@@ -2,7 +2,6 @@
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.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;
@@ -16,7 +15,6 @@
import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper;
@@ -24,11 +22,9 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.Date;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
-import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -50,7 +46,7 @@
private AppointmentMapper appointmentMapper;
@Override
- public Integer createAppointment(AppointmentSaveReqVO createReqVO) {
+ public Long createAppointment(AppointmentSaveReqVO createReqVO) {
// 鎻掑叆
AppointmentDO appointment = BeanUtils.toBean(createReqVO, AppointmentDO.class);
@@ -72,27 +68,39 @@
}
@Override
- public void deleteAppointment(Integer id) {
+ public void deleteAppointment(Long id) {
// 鏍￠獙瀛樺湪
validateAppointmentExists(id);
// 鍒犻櫎
appointmentMapper.deleteById(id);
}
- private void validateAppointmentExists(Integer id) {
+ private void validateAppointmentExists(Long id) {
if (appointmentMapper.selectById(id) == null) {
throw exception(APPOINTMENT_NOT_EXISTS);
}
}
@Override
- public AppointmentDO getAppointment(Integer id) {
+ public AppointmentDO getAppointment(Long id) {
return appointmentMapper.selectById(id);
}
@Override
public AppointmentDO getAppointmentByPatId(String patId) {
- return appointmentMapper.getByPatId( patId );
+ // 鍏堜粠鍖婚櫌骞冲彴鏌ヨ
+ AppointmentDO appointmentExtermal = getAppointmentExtermal( patId );
+ if (null != appointmentExtermal && null != appointmentExtermal.getBookDate()) {
+ // 鏌ヨDB涓� 鏄惁宸茬粡瀛樺湪
+ AppointmentDO appointmentDO = appointmentMapper.getCurrentPatId( patId );
+ if (null == appointmentDO ) {
+ appointmentMapper.insert( appointmentExtermal );
+ return appointmentExtermal;
+ }
+ return appointmentDO;
+ }
+
+ return appointmentMapper.getCurrentPatId( patId );
}
@Override
@@ -141,19 +149,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String appoitmentConfirm(AppointmentConfirmReqVO confirmReqVO) {
- AppointmentDO appointment = getAppointmentExtermal(confirmReqVO.getMzzyh());
- if (null == appointment ) {
- //浠庨绾﹁〃鍙栨暟鎹紝鍚庣画瀵规帴鏁版嵁骞冲彴鏌ラ绾︽暟鎹�
- appointment = getAppointment(confirmReqVO.getId());
- }
-
+ AppointmentDO appointment = getAppointment(confirmReqVO.getId());
if (null == appointment)
throw exception(PATIENT_NOT_EXISTS);
if ( !DateUtils.isToday(appointment.getBookDate()) )
throw exception( APPOINTMENT_NOT_TODAY);
-
- appointmentMapper.insert(appointment);
try {
QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
--
Gitblit v1.9.3