appointment table key Integer -> Long

eight

2024-10-29 18f2eb72590ce5ff79693eb8a27188a499bbd114

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