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/QueuePageReqVO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
index 312e68d..55da54a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
@@ -1,5 +1,7 @@
package cn.lihu.jh.module.ecg.controller.admin.queue.vo;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
+import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
@@ -7,6 +9,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Map;
import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -15,6 +18,12 @@
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class QueuePageReqVO extends PageParam {
+
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
+
+ @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024435")
+ private String episodeId;
@Schema(description = "鎮ｈ�呯紪鍙�", example = "30473")
private String patId;
@@ -25,6 +34,9 @@
@Schema(description = "鎮ｈ�呮�у埆")
private Boolean patGender;
+ @Schema(description = "鎮ｈ�呰鎯�")
+ private PatDetails patDetails;
+
@Schema(description = "棰勭害鏃ユ湡")
private LocalDate bookDate;
@@ -32,12 +44,19 @@
private Integer bookTimeslot;
@Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "1")
- private Boolean bookCheckType;
+ private Integer bookCheckType;
+
+ @Schema(description = "棰勭害搴忓彿")
+ private Integer bookSeqNum;
@Schema(description = "鎺掗槦搴忓彿")
private Integer seqNum;
+
+ @Schema(description = "VIP")
+ private Integer isVip;
+
@Schema(description = "5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 ", example = "1")
- private Byte status;
+ private Integer[] status;
@Schema(description = "杩囧彿鏍囪")
private Boolean passed;
--
Gitblit v1.9.3