调整 Calling Data Type

eight

2024-09-05 6c5098a2ab950684accd6fa74820a95a079a45b5

调整 Calling Data Type

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

@@ -163,18 +163,18 @@
    @GetMapping("/calling-data")
    @Operation(summary = "大屏叫号数据")
    @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
    public CommonResult<List<QueueRespVO>> callingData(
    public CommonResult<List<CallingRespVO>> callingData(
            @RequestParam("waitingNum") Integer waitingNum,
            @RequestParam("passedNum") Integer passedNum)
    {
        List<QueueDO> queueDOList = queueService.callingData(waitingNum, passedNum);
        return success( BeanUtils.toBean(queueDOList, QueueRespVO.class) );
        return success( BeanUtils.toBean(queueDOList, CallingRespVO.class) );
    }

    @GetMapping("/room-screen-data")
    @Operation(summary = "诊间屏数据")
    @PermitAll
    public CommonResult<List<QueueRespVO>> callingDataRoom(HttpServletRequest request)
    public CommonResult<List<CallingRespVO>> callingDataRoom(HttpServletRequest request)
    {
        String reqIp = ServletUtil.getClientIP(request);

@@ -184,7 +184,7 @@
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());

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

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
package cn.lihu.jh.module.ecg.controller.admin.queue.vo;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Schema(description = "叫号屏数据")
@Data
public class CallingRespVO {

    @Schema(description = "患者编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30473")
    @ExcelProperty("患者编号")
    private String patId;

    @Schema(description = "患者姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
    @ExcelProperty("患者姓名")
    private String patName;

    @Schema(description = "患者性别")
    @ExcelProperty("患者性别")
    private Byte patGender;

    @Schema(description = "预约检查类型", example = "1")
    @ExcelProperty("预约检查类型")
    private Byte bookCheckType;

    @Schema(description = "排队序号", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("排队序号")
    private Integer seqNum;

    @Schema(description = "过号标记", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("过号标记")
    private Byte passed;

    @Schema(description = "预约过期标记", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("预约过期标记")
    private Byte expired;

    @Schema(description = "插队标记", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("插队标记")
    private Byte jumpFlag;

    @Schema(description = "诊室编号")
    @ExcelProperty("诊室编号")
    private Long roomId;

    @Schema(description = "诊室名称")
    @ExcelProperty("诊室名称")
    private String roomName;

    @Schema(description = "诊疗床编号")
    @ExcelProperty("诊疗床编号")
    private String bedNo;
}