update

eight

2024-10-15 647095a34d62db02533cf9c121436900b51c757c

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java

@@ -3,11 +3,13 @@
import cn.hutool.core.bean.BeanUtil;
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.devrent.vo.DevRentSaveReqVO;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
import cn.lihu.jh.module.ecg.feign.RemoteDataService;
import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
import cn.lihu.jh.module.ecg.feign.RestApiResult;
import cn.lihu.jh.module.ecg.feign.dto.AppointmentExternal;
import cn.lihu.jh.module.ecg.service.devrent.DevRentService;
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;
@@ -38,6 +40,7 @@

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;

@@ -66,6 +69,9 @@

    @Resource
    private RemoteDataService remoteDataService;

    @Resource
    private DevRentService devRentService;

    @Resource
    private DeptApi deptApi;
@@ -100,6 +106,15 @@
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
    public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Integer id) {
        AppointmentDO appointment = appointmentService.getAppointment(id);
        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
    }

    @GetMapping("/get-by-patient")
    @Operation(summary = "获得预约")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
    public CommonResult<AppointmentRespVO> getAppointmentByPatient(@RequestParam("patId") String patId) {
        AppointmentDO appointment = appointmentService.getAppointmentByPatId( patId );
        return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
    }

@@ -165,7 +180,7 @@
                        + bookEndTime.getHour()*100 + bookEndTime.getMinute() );

        //queueSaveReqVO.setBookCheckType( Byte.valueOf(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) );
        queueSaveReqVO.setBookCheckType( (byte)10 );
        queueSaveReqVO.setBookCheckType( 10 );

        queueSaveReqVO.setSeqNum(1);
        queueSaveReqVO.setStatus((byte)10);
@@ -184,11 +199,11 @@
    public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
        //TODO 先从预约表取数据，后续对接数据平台查预约数据
        AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
        if (null == appointment)
            return error(PATIENT_NOT_EXISTS);

/*  TODO  for Testing
        if ( !DateUtils.isToday(appointment.getBookDate()) )
            return error( new ErrorCode(101, "不是今天的预约用户"));
*/
            return error( APPOINTMENT_NOT_TODAY);

        try {
            QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
@@ -205,6 +220,6 @@
            return success("您已经在排队中了");
        }

        return success("hello");
        return success("操作成功");
    }
}