update

eight

2024-10-25 cced6dcf0a6eb12712737806c46d8ef35d1c65ac

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

@@ -3,11 +3,14 @@
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.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;
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;
@@ -69,6 +72,9 @@
    private RemoteDataService remoteDataService;

    @Resource
    private DevRentService devRentService;

    @Resource
    private DeptApi deptApi;

    @PostMapping("/create")
@@ -101,6 +107,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));
    }

@@ -166,10 +181,10 @@
                        + 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);
        queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus());
        queueSaveReqVO.setPassed((byte)0);
        queueSaveReqVO.setExpired((byte)0);

@@ -201,11 +216,12 @@
            queueSaveReqVO.setBookCheckType(appointment.getBookCheckType());
            queueSaveReqVO.setPassed((byte) 0);
            queueSaveReqVO.setExpired((byte) 0);
            queueSaveReqVO.setPatDetails( appointment.getPatDeptDesc() + "-" + appointment.getPatWardDesc() + "-" + appointment.getPatBedNo());
            queueService.queue(queueSaveReqVO);
        } catch (DuplicateKeyException duplicateKeyException) {
            return success("您已经在排队中了");
        }

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