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/devrent/vo/DevCancelReqVO.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevCancelReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevCancelReqVO.java index e44776e..2ce1571 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevCancelReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevCancelReqVO.java @@ -1,5 +1,6 @@ package cn.lihu.jh.module.ecg.controller.admin.devrent.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,6 +14,12 @@ @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26525") private Long id; + @Schema(description = "棰勭害鐢宠鍙�", example = "2024435") + private String applyNo; + + @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546") + private String episodeId; + @Schema(description = "璁惧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3986") private String devId; @@ -24,11 +31,18 @@ @NotEmpty(message = "鎮h�呭悕绉颁笉鑳戒负绌�") private String patName; + @Schema(description = "妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙") + @NotEmpty(message = "妫�鏌ョ被鍨嬩笉鑳戒负绌�") + private Integer checkType; + @Schema(description = "瑁呮満鏃堕棿") private LocalDateTime rentTime; @Schema(description = "鎷嗘満鏃堕棿") private LocalDateTime returnTime; + + @Schema(description = "褰曞叆鏃堕棿") + private LocalDateTime entryTime; @Schema(description = "骞叉壈鏁�") private Integer interference; @@ -41,8 +55,4 @@ @Schema(description = "澶囨敞", example = "浣犵寽") private String remark; - - @Schema(description = "鍙栨秷瀹夎") - private Integer cancelled; - } \ No newline at end of file -- Gitblit v1.9.3