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/DevRentRespVO.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java index 52c82fc..5aed9ce 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java @@ -1,5 +1,6 @@ package cn.lihu.jh.module.ecg.controller.admin.devrent.vo; +import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -16,6 +17,14 @@ @ExcelProperty("id") private Long id; + @Schema(description = "棰勭害鐢宠鍙�", example = "2024435") + @ExcelProperty("棰勭害鐢宠鍙�") + private String applyNo; + + @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546") + @ExcelProperty("灏辫瘖娴佹按鍙�") + private String episodeId; + @Schema(description = "璁惧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3986") @ExcelProperty("璁惧缂栧彿") private String devId; @@ -28,6 +37,14 @@ @ExcelProperty("鎮h�呭悕绉�") private String patName; + @Schema(description = "鎮h�呰鎯�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙") + @ExcelProperty("鎮h�呰鎯�") + private PatDetails patDetails; + + @Schema(description = "妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙") + @ExcelProperty("妫�鏌ョ被鍨�") + private Integer checkType; + @Schema(description = "瑁呮満鏃堕棿") @ExcelProperty("瑁呮満鏃堕棿") private LocalDateTime rentTime; @@ -35,6 +52,10 @@ @Schema(description = "鎷嗘満鏃堕棿") @ExcelProperty("鎷嗘満鏃堕棿") private LocalDateTime returnTime; + + @Schema(description = "褰曞叆鏃堕棿") + @ExcelProperty("褰曞叆鏃堕棿") + private LocalDateTime entryTime; @Schema(description = "骞叉壈鏁�") @ExcelProperty("骞叉壈鏁�") @@ -56,6 +77,10 @@ @ExcelProperty("鐘舵��") private Integer state; + @Schema(description = "宸蹭粯娆�") + @ExcelProperty("宸蹭粯娆�") + private Integer paid; + @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("鍒涘缓鏃堕棿") private LocalDateTime createTime; -- Gitblit v1.9.3