update

eight

2024-08-22 a7b5ec90a38f93bc1da2f48676c16bb757cb05f7

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

@@ -2,13 +2,13 @@

import cn.hutool.core.bean.BeanUtil;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
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.queue.QueueService;
import com.alibaba.fastjson.JSONObject;
import cn.lihu.jh.module.ecg.service.room.RoomService;
import cn.lihu.jh.module.system.api.dept.DeptApi;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,10 +17,8 @@
import io.swagger.v3.oas.annotations.Operation;

import java.time.LocalDateTime;
import java.time.chrono.IsoChronology;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.ResolverStyle;
import java.util.*;
import java.io.IOException;
import java.util.stream.Collectors;
@@ -59,7 +57,13 @@
    private QueueService queueService;

    @Resource
    private RoomService roomService;

    @Resource
    private RemoteDataService remoteDataService;

    @Resource
    private DeptApi deptApi;

    @PostMapping("/create")
    @Operation(summary = "创建预约")
@@ -115,14 +119,8 @@
                        BeanUtils.toBean(list, AppointmentRespVO.class));
    }

    @PostMapping("/confirm")
    @Operation(summary = "预约确认")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
    public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
        //TODO 处理排队逻辑
        //AppointmentDO appointment = appointmentService.getAppointment(id);
        //return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));

    // TODO 对接数据平台
    private void getRemoteAppointment(AppointmentConfirmReqVO confirmReqVO) {
        RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo();
        reqBodyVo.setSfzh(confirmReqVO.getPatId());
        reqBodyVo.setMzzyh("A34343");
@@ -159,7 +157,7 @@
        LocalDateTime bookEndTime = bookStartTime.plusMinutes(30);
        queueSaveReqVO.setBookTimeslot(
                (bookStartTime.getHour()*100 + bookStartTime.getMinute())*10000
                + bookEndTime.getHour()*100 + bookEndTime.getMinute() );
                        + bookEndTime.getHour()*100 + bookEndTime.getMinute() );

        //queueSaveReqVO.setBookCheckType( Byte.valueOf(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) );
        queueSaveReqVO.setBookCheckType( (byte)10 );
@@ -169,10 +167,28 @@
        queueSaveReqVO.setPassed((byte)0);
        queueSaveReqVO.setExpired((byte)0);

        queueSaveReqVO.setRoomNum("-");
        queueSaveReqVO.setBedNum("-");
        queueSaveReqVO.setRoomName("-");
        queueSaveReqVO.setBedNo("-");

        queueService.createqueue(queueSaveReqVO);
    }

    @PostMapping("/confirm")
    @Operation(summary = "预约确认")
    @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
    public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
        //TODO 先从预约表取数据，后续对接数据平台查预约数据
        AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());

        QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
        queueSaveReqVO.setPatId( appointment.getPatId());
        queueSaveReqVO.setPatName( appointment.getPatName() );
        queueSaveReqVO.setPatGender( appointment.getPatGender());
        queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
        queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
        queueSaveReqVO.setPassed((byte)0);
        queueSaveReqVO.setExpired((byte)0);
        queueService.queue(queueSaveReqVO);

        return success("hello");
    }