update

eight

2024-08-15 8c2f79b721a05fbf73c50a78b267ea3868c632d2

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

@@ -4,11 +4,14 @@
import cn.lihu.jh.framework.common.enums.CommonStatusEnum;
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.dal.dataobject.queue.QueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
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 cn.lihu.jh.module.ecg.service.room.RoomService;
import cn.lihu.jh.module.system.api.dept.DeptApi;
import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
import com.alibaba.fastjson.JSONObject;
@@ -61,6 +64,9 @@

    @Resource
    private QueueService queueService;

    @Resource
    private RoomService roomService;

    @Resource
    private RemoteDataService remoteDataService;
@@ -122,14 +128,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");
@@ -166,7 +166,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 );
@@ -180,34 +180,24 @@
        queueSaveReqVO.setBedNum("-");

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

        // 获取候诊准备的配置人数  ， 营业的诊室

/*
        List<DeptDO> list = deptService.getDeptList(
                new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
        return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
*/

        List<DeptRespDTO> deptRespDTOList = deptApi.getSimpleDeptList();
        Optional<DeptRespDTO> ecgDept = deptRespDTOList.stream()
                .filter(a -> a.getName().equals("ECG"))
                .findAny();

        if (ecgDept.isPresent()){
            System.out.println(ecgDept.get().getName());

            List<DeptRespDTO> list2 = deptRespDTOList.stream()
                    .filter(a -> Objects.equals(a.getParentId(), ecgDept.get().getId()))
                    .toList();
            list2.forEach(System.out::println);
            list2.size();
        }

        // 获取 每个营业的诊室 候诊准备的当前人数  就诊中的当前人数
        // queueService.get

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