From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 28 十一月 2024 14:40:46 +0800 Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java index c83c0e0..687a2e5 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java @@ -1,10 +1,14 @@ package cn.lihu.jh.module.ecg.controller.admin.devrent.vo; +import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.springframework.web.bind.annotation.RequestParam; import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; +import java.util.Map; @Schema(description = "绠$悊鍚庡彴 - 瑁呮満鎷嗘満鏂板/淇敼 Request VO") @Data @@ -25,11 +29,17 @@ @NotEmpty(message = "鎮h�呭悕绉颁笉鑳戒负绌�") private String patName; + @Schema(description = "妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙") + private Integer checkType; + @Schema(description = "瑁呮満鏃堕棿") private LocalDateTime rentTime; @Schema(description = "鎷嗘満鏃堕棿") private LocalDateTime returnTime; + + @Schema(description = "褰曞叆鏃堕棿") + private LocalDateTime entryTime; @Schema(description = "骞叉壈鏁�") private Integer interference; @@ -43,7 +53,18 @@ @Schema(description = "澶囨敞", example = "浣犵寽") private String remark; - @Schema(description = "鍙栨秷瀹夎") - private Integer cancelled; + @Schema(description = "鐘舵��") + private Integer state; -} \ No newline at end of file + @Schema(description = "宸蹭粯娆�") + private Integer paid; + + @Schema(description = "璇婂缂栧彿") + Long roomId; + + @Schema(description = "璇婂簥缂栧彿") + String bedNo; + + @Schema(description = "鎮h�呰鎯�") + PatDetails patDetails; +} -- Gitblit v1.9.3