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/DevRentRespVO.java |   17 +++++++++++++++++
 1 files changed, 17 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..51ae3a5 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.*;
@@ -28,6 +29,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 +44,10 @@
     @Schema(description = "鎷嗘満鏃堕棿")
     @ExcelProperty("鎷嗘満鏃堕棿")
     private LocalDateTime returnTime;
+
+    @Schema(description = "褰曞叆鏃堕棿")
+    @ExcelProperty("褰曞叆鏃堕棿")
+    private LocalDateTime entryTime;
 
     @Schema(description = "骞叉壈鏁�")
     @ExcelProperty("骞叉壈鏁�")
@@ -56,6 +69,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