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/appointment/vo/AppointmentRespVO.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 39348f9..985bad8 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
@@ -16,7 +16,19 @@
@ExcelIgnoreUnannotated
public class AppointmentRespVO {
- private Integer id;
+ private Long id;
+
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ @ExcelProperty("棰勭害鐢宠鍙�")
+ private String applyNo;
+
+ @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
+ @ExcelProperty("灏辫瘖娴佹按鍙�")
+ private String episodeId;
+
+ @Schema(description = "鎮ｈ�呮潵婧�", example = "2024546")
+ @ExcelProperty("鎮ｈ�呮潵婧�")
+ private Integer patSrc;
@Schema(description = "鎮ｈ�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034")
@ExcelProperty("鎮ｈ�呯紪鍙�")
@@ -71,10 +83,6 @@
@ExcelProperty("搴婂彿")
private String patBedNo;
- @Schema(description = "棰勭害缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "27849")
- @ExcelProperty("棰勭害缂栧彿")
- private String bookId;
-
@Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鏃ユ湡")
private LocalDate bookDate;
@@ -89,12 +97,15 @@
@Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class)
- @DictFormat("ecg_check_type") // TODO 浠ｇ爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑
- private Byte 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("宸蹭粯娆�")
--
Gitblit v1.9.3