From dc90adfdd8b5efe8368d831e8fd5c89002c92b68 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 29 十月 2024 16:03:12 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java | 4 ----
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 5 +----
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 27 ++++++++++++++-------------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
index b13fef2..4710693 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
@@ -14,10 +14,6 @@
private Integer id;
- @Schema(description = "闂ㄨ瘖浣忛櫌鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034")
- @NotEmpty(message = "闂ㄨ瘖浣忛櫌鍙蜂笉鑳戒负绌�")
- private String mzzyh;
-
@Schema(description = "鎮ｈ�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034")
//@NotEmpty(message = "鎮ｈ�呯紪鍙蜂笉鑳戒负绌�")
private String patId;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
index 2e7688b..4ef0f2f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
@@ -1,12 +1,9 @@
package cn.lihu.jh.module.ecg.dal.mysql.appointment;
-import java.util.*;
-
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import org.apache.ibatis.annotations.Mapper;
import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import org.apache.ibatis.annotations.Param;
@@ -47,7 +44,7 @@
@Select("select * from lihu.appointment where pat_id = #{patId} and to_days(book_date) = to_days(Now()) limit 1")
- AppointmentDO getByPatId(@Param("patId") String patId);
+ AppointmentDO getCurrentPatId(@Param("patId") String patId);
}
\ No newline at end of file
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..9a53eaf 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.*;
/**
@@ -92,7 +88,19 @@
@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