From a2a840d4969d680b30eeec184a7059fef64d0b84 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 04 七月 2025 21:39:14 +0800 Subject: [PATCH] 代码提交 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 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 340247a..6623fe0 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 @@ -3,10 +3,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.sql.Date; import java.time.LocalDate; import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; + import com.alibaba.excel.annotation.*; import cn.lihu.jh.framework.excel.core.annotations.DictFormat; import cn.lihu.jh.framework.excel.core.convert.DictConvert; @@ -96,6 +100,7 @@ private LocalDateTime bookTime; @Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @DictFormat("ecg_check_type") @ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class) private Integer bookCheckType; @@ -104,15 +109,27 @@ private Integer bookSeqNum; @Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�") +// @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�") private Integer bookSrc; - @Schema(description = "宸蹭粯娆�") - @ExcelProperty("宸蹭粯娆�") + @Schema(description = "宸蹭粯娆� 0-鏈氦璐� 1-宸茬即璐�") + @DictFormat("ecg_pay_type") + @ExcelProperty(value = "浠樻鐘舵��", converter = DictConvert.class) private Integer paid; // @TableField(exist = false) + @Schema(description = "鐘舵��") + @DictFormat("ecg_status_type") + @ExcelProperty(value = "鐘舵��", converter = DictConvert.class) private String status; + + + /** + * 鐧昏鏃堕棿 + */ + @Schema(description = "鐧昏鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("鐧昏鏃堕棿") + private Date registerDate; /** * 鑰愯嵂鎬э細 鏄惁澶氳��1浠h〃鏄紝0浠h〃涓嶆槸 @@ -120,7 +137,7 @@ private String tolerance; /** - *浣忛櫌鍙� + * 浣忛櫌鍙� */ private String hospitalNo; @@ -133,4 +150,7 @@ * 闂ㄨ瘖鍙� */ private String outpatientNo; + + private LocalDateTime createTime; + } -- Gitblit v1.9.3