update

eight

2024-08-28 e10ff52c2bbb86eac5b2c4bdf12b852912a1f798

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java

@@ -1,30 +1,28 @@
package cn.lihu.jh.module.ecg.service.queue;

import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Resource;

import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;

import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.infra.api.config.ConfigApi;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;

import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;

import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;

import javax.annotation.Resource;

import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;

import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -255,12 +253,12 @@
            return error(QUEUE_BED_ABNORMAL);
        }

        RoomResVO roomResVO = roomMapper.getRoom(roomId, bedNo, docId);
        if (null == roomResVO) {
        RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
        if (null == roomDO) {
            return error(ECG_INNER_ERROR);
        }

        RoomRespVO roomRespVO = BeanUtils.toBean(roomResVO, RoomRespVO.class);
        RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
        return success(roomRespVO);
    }

@@ -372,7 +370,7 @@
        bedStatusEnumList.add(BedStatusEnum.OPENING);
        bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
        bedStatusEnumList.add(BedStatusEnum.PAUSE);
        List<RoomResVO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
        List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
        List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();

        // 从DB 获取 队列中 就诊准备中人员统计 列表