From 22b0761897d0959d0a3dc34c68efc27705b17526 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 09 十月 2024 17:10:00 +0800 Subject: [PATCH] 1. 根据检查类型,配置 准备中 人数 2. 医生入座,才允许 患者 进入 准备中 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 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 8b2696e..39348f9 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,8 @@ @ExcelIgnoreUnannotated public class AppointmentRespVO { + private Integer id; + @Schema(description = "鎮h�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034") @ExcelProperty("鎮h�呯紪鍙�") private String patId; @@ -25,11 +29,11 @@ @Schema(description = "鎮h�呮�у埆", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty(value = "鎮h�呮�у埆", converter = DictConvert.class) @DictFormat("system_user_sex") // TODO 浠g爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑 - private Boolean patGender; + private Byte patGender; @Schema(description = "鎮h�呯敓鏃�") @ExcelProperty("鎮h�呯敓鏃�") - private LocalDate patBirthday; + private LocalDateTime patBirthday; @Schema(description = "鎮h�呮墜鏈�") @ExcelProperty("鎮h�呮墜鏈�") @@ -71,13 +75,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("棰勭害鍙戠敓鏃堕棿") @@ -86,10 +90,13 @@ @Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class) @DictFormat("ecg_check_type") // TODO 浠g爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑 - private Boolean bookCheckType; + private Byte bookCheckType; @Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�") private String bookSrc; + @Schema(description = "宸蹭粯娆�") + @ExcelProperty("宸蹭粯娆�") + private Integer paid; } \ No newline at end of file -- Gitblit v1.9.3