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/devmanage/vo/DeviceRespVO.java |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
index 8c0a3d0..d899088 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
@@ -1,5 +1,6 @@
 package cn.lihu.jh.module.ecg.controller.admin.devmanage.vo;
 
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -22,6 +23,18 @@
     @ExcelProperty("璁惧缂栧彿")
     private String devId;
 
+    @Schema(description = "璁惧鍥烘湁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+    @ExcelProperty("璁惧鍥烘湁缂栧彿")
+    private String devCodeIntrinsic;
+
+    @Schema(description = "璁惧鍖婚櫌缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+    @ExcelProperty("璁惧鍖婚櫌缂栧彿")
+    private String devCodeHosp;
+
+    @Schema(description = "璁惧绉戝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+    @ExcelProperty("璁惧绉戝缂栧彿")
+    private String devCodeDept;
+
     @Schema(description = "鍒嗙被鍚�", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("鍒嗙被鍚�")
     private String category;
@@ -42,11 +55,22 @@
     @ExcelProperty("鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
-    @Schema(description = "閬楀け")
-    @ExcelProperty("鏄惁閬楀け")
-    private Integer lost;
+    @Schema(description = "鐘舵�佹棩鏈�")
+    @ExcelProperty("鐘舵�佹棩鏈�")
+    private LocalDate stateDate;
 
-    @Schema(description = "閬楀け鏃ユ湡")
-    @ExcelProperty("閬楀け鏃ユ湡")
-    private LocalDate loseDate;
-}
\ No newline at end of file
+    /**
+     * 0 - 绌洪棽 10 - 浣跨敤涓� 20 - 宸查仐澶�
+     */
+    @Schema(description = "鐘舵��")
+    @ExcelProperty("鐘舵��")
+    private Integer state;
+
+    @Schema(description = "鎷嗚缂栧彿")
+    @ExcelProperty("鎷嗚缂栧彿")
+    private Long rentId;
+
+    @Schema(description = "鎮h�呰鎯�")
+    @ExcelProperty("鎮h�呰鎯�")
+    private PatDetails patDetails;
+}

--
Gitblit v1.9.3