From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 28 十一月 2024 14:40:46 +0800
Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
index 13eb37d..907b5db 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
@@ -2,6 +2,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+
+import java.time.LocalDate;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -14,6 +16,12 @@
@ExcelIgnoreUnannotated
public class AppointmentRespVO {
+ private Long id;
+
+ @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
+ @ExcelProperty("灏辫瘖娴佹按鍙�")
+ private String episodeId;
+
@Schema(description = "鎮ｈ�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034")
@ExcelProperty("鎮ｈ�呯紪鍙�")
private String patId;
@@ -25,7 +33,7 @@
@Schema(description = "鎮ｈ�呮�у埆", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty(value = "鎮ｈ�呮�у埆", converter = DictConvert.class)
@DictFormat("system_user_sex") // TODO 浠ｇ爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑
- private Boolean patGender;
+ private Byte patGender;
@Schema(description = "鎮ｈ�呯敓鏃�")
@ExcelProperty("鎮ｈ�呯敓鏃�")
@@ -71,13 +79,13 @@
@ExcelProperty("棰勭害缂栧彿")
private String bookId;
- @Schema(description = "棰勭害妫�鏌ユ椂闂存", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("棰勭害妫�鏌ユ椂闂存")
- private LocalDateTime bookPeriodStart;
+ @Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("棰勭害鏃ユ湡")
+ private LocalDate bookDate;
- @Schema(description = "棰勭害妫�鏌ユ椂闂存", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("棰勭害妫�鏌ユ椂闂存")
- private LocalDateTime bookPeriodEnd;
+ @Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("棰勭害鏃堕棿娈�")
+ private Integer bookTimeslot;
@Schema(description = "棰勭害鍙戠敓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鍙戠敓鏃堕棿")
@@ -85,11 +93,17 @@
@Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class)
- @DictFormat("ecg_check_type") // TODO 浠ｇ爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑
- private Boolean bookCheckType;
+ private Integer bookCheckType;
+
+ @Schema(description = "鍐呴儴棰勭害缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍐呴儴棰勭害缂栧彿")
+ private Integer bookSeqNum;
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
- private String bookSrc;
+ private Integer bookSrc;
+ @Schema(description = "宸蹭粯娆�")
+ @ExcelProperty("宸蹭粯娆�")
+ private Integer paid;
}
\ No newline at end of file
--
Gitblit v1.9.3