From 0fa1f4767affcd1879709ebea630016356836c75 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 18 九月 2026 15:07:20 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/ecg
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
index 6969287..57ce465 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
@@ -1,10 +1,15 @@
package cn.lihu.jh.module.ecg.controller.admin.queue.vo;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Map;
+
import com.alibaba.excel.annotation.*;
@Schema(description = "绠＄悊鍚庡彴 - 鎺掗槦 Response VO")
@@ -12,15 +17,23 @@
@ExcelIgnoreUnannotated
public class QueueRespVO {
- @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21320")
+ @Schema(description = "id", example = "21320")
@ExcelProperty("id")
private Integer id;
- @Schema(description = "鎮ｈ�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "30473")
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ @ExcelProperty("棰勭害鐢宠鍙�")
+ private String applyNo;
+
+ @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024435")
+ @ExcelProperty("灏辫瘖娴佹按鍙�")
+ private String episodeId;
+
+ @Schema(description = "鎮ｈ�呯紪鍙�", example = "30473")
@ExcelProperty("鎮ｈ�呯紪鍙�")
private String patId;
- @Schema(description = "鎮ｈ�呭鍚�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙")
+ @Schema(description = "鎮ｈ�呭鍚�", example = "鑺嬭壙")
@ExcelProperty("鎮ｈ�呭鍚�")
private String patName;
@@ -30,7 +43,7 @@
@Schema(description = "鎮ｈ�呰鎯�")
@ExcelProperty("鎮ｈ�呰鎯�")
- private String patDetails;
+ private PatDetails patDetails;
@Schema(description = "棰勭害鏃ユ湡")
@ExcelProperty("棰勭害鏃ユ湡")
@@ -44,9 +57,17 @@
@ExcelProperty("棰勭害妫�鏌ョ被鍨�")
private Integer bookCheckType;
+ @Schema(description = "棰勭害搴忓彿")
+ @ExcelProperty("棰勭害搴忓彿")
+ private Integer bookSeqNum;
+
@Schema(description = "鎺掗槦搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鎺掗槦搴忓彿")
private Integer seqNum;
+
+ @Schema(description = "VIP")
+ @ExcelProperty("VIP")
+ private Integer isVip;
@Schema(description = "5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 ")
@@ -80,4 +101,22 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+ @TableField(exist = false)
+ private String tolerance;
+
+ /**
+ * 浠ヤ笅瀛楁鏉ヨ嚜棰勭害鍗曪紙appointment锛夛紝鐢� QueueServiceImpl#fillAppointmentInfo 濉厖
+ */
+ @Schema(description = "鎮ｈ�呯敓鏃�")
+ private LocalDate patBirthday;
+
+ @Schema(description = "鐧昏鏃堕棿")
+ private Date registerDate;
+
+ @Schema(description = "寮�鍗曞尰甯�")
+ private String doctor;
+
+ @Schema(description = "寮�鍗曟棩鏈燂紙寮�鍗曟椂闂达級")
+ private Date doctorTime;
+
+}
--
Gitblit v1.9.3