update

eight

2024-10-29 dc90adfdd8b5efe8368d831e8fd5c89002c92b68

update

 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;

 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);


}

 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();