From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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 02dfd7b..88ce74a 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,13 @@
package cn.lihu.jh.module.ecg.controller.admin.queue.vo;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Map;
+
import com.alibaba.excel.annotation.*;
@Schema(description = "绠＄悊鍚庡彴 - 鎺掗槦 Response VO")
@@ -12,21 +15,33 @@
@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;
@Schema(description = "鎮ｈ�呮�у埆")
@ExcelProperty("鎮ｈ�呮�у埆")
private Byte patGender;
+
+ @Schema(description = "鎮ｈ�呰鎯�")
+ @ExcelProperty("鎮ｈ�呰鎯�")
+ private PatDetails patDetails;
@Schema(description = "棰勭害鏃ユ湡")
@ExcelProperty("棰勭害鏃ユ湡")
@@ -38,15 +53,23 @@
@Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "1")
@ExcelProperty("棰勭害妫�鏌ョ被鍨�")
- private Byte bookCheckType;
+ private Integer bookCheckType;
+
+ @Schema(description = "棰勭害搴忓彿")
+ @ExcelProperty("棰勭害搴忓彿")
+ private Integer bookSeqNum;
@Schema(description = "鎺掗槦搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鎺掗槦搴忓彿")
private Integer seqNum;
- @Schema(description = "10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @ExcelProperty("10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡")
- private Byte status;
+ @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:灏辫瘖瀹屾垚 ")
+ private Integer status;
@Schema(description = "杩囧彿鏍囪", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("杩囧彿鏍囪")
--
Gitblit v1.9.3