From 6c5098a2ab950684accd6fa74820a95a079a45b5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 05 九月 2024 09:33:00 +0800
Subject: [PATCH] 调整 Calling Data Type
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 8 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/CallingRespVO.java | 58 +++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
index 05ab0b3..4ae696f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
+++ b/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));
}
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/CallingRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/CallingRespVO.java
new file mode 100644
index 0000000..ace003d
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
--
Gitblit v1.9.3