诊间屏

eight

2024-09-04 b765c3a93685c4c97601aff6291a00ec770a537e

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java

@@ -1,6 +1,8 @@
package cn.lihu.jh.module.ecg.controller.admin.queue;

import cn.hutool.extra.servlet.ServletUtil;
import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.util.servlet.ServletUtils;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
@@ -35,6 +37,8 @@
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.service.queue.QueueService;

import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.annotation.Resource;
@@ -169,17 +173,17 @@

    @GetMapping("/room-screen-data")
    @Operation(summary = "诊间屏数据")
    @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
    public CommonResult<List<QueueRespVO>> callingDataRoom(
            @RequestParam("roomId") Long roomId,
            @RequestParam("bedNo") String bedNo)
    @PermitAll
    public CommonResult<List<QueueRespVO>> callingDataRoom(HttpServletRequest request)
    {
        String reqIp = ServletUtil.getClientIP(request);

        List<Byte> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.READY.getStatus());
        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());

        List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
        List<QueueDO> queueDOList = queueService.getRoomQueue(reqIp, queueStatusList);
        return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
    }