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 | 81 +++++++++++++++++++++++++++++++++++----- 1 files changed, 71 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 20735b9..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 @@ -2,9 +2,15 @@ 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; @@ -13,6 +19,20 @@ @Data @ExcelIgnoreUnannotated public class AppointmentRespVO { + + private Long id; + + @Schema(description = "棰勭害鐢宠鍙�", example = "2024435") + @ExcelProperty("棰勭害鐢宠鍙�") + private String applyNo; + + @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546") + @ExcelProperty("灏辫瘖娴佹按鍙�") + private String episodeId; + + @Schema(description = "鎮h�呮潵婧�", example = "2024546") + @ExcelProperty("鎮h�呮潵婧�") + private Integer patSrc; @Schema(description = "鎮h�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034") @ExcelProperty("鎮h�呯紪鍙�") @@ -67,13 +87,9 @@ @ExcelProperty("搴婂彿") private String patBedNo; - @Schema(description = "棰勭害缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "27849") - @ExcelProperty("棰勭害缂栧彿") - private String bookId; - @Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("棰勭害鏃ユ湡") - private LocalDateTime bookDate; + private LocalDate bookDate; @Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("棰勭害鏃堕棿娈�") @@ -84,12 +100,57 @@ private LocalDateTime bookTime; @Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @DictFormat("ecg_check_type") @ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class) - @DictFormat("ecg_check_type") // TODO 浠g爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� 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; +// @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�") + private Integer bookSrc; -} \ No newline at end of file + @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〃涓嶆槸 + */ + private String tolerance; + + /** + * 浣忛櫌鍙� + */ + private String hospitalNo; + + /** + * 鍖讳繚鍗″彿 + */ + private String medicalCard; + + /** + * 闂ㄨ瘖鍙� + */ + private String outpatientNo; + + private LocalDateTime createTime; + +} -- Gitblit v1.9.3