From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java | 92 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 6 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 d57c0ba..6478333 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,9 +1,11 @@
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.*;
import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@@ -15,6 +17,14 @@
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26525")
@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("璁惧缂栧彿")
@@ -28,6 +38,14 @@
@ExcelProperty("鎮ｈ�呭悕绉�")
private String patName;
+ @Schema(description = "鎮ｈ�呰鎯�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙")
+ @ExcelProperty("鎮ｈ�呰鎯�")
+ private PatDetails patDetails;
+
+ @Schema(description = "妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鑺嬭壙")
+ @ExcelProperty("妫�鏌ョ被鍨�")
+ private Integer checkType;
+
@Schema(description = "瑁呮満鏃堕棿")
@ExcelProperty("瑁呮満鏃堕棿")
private LocalDateTime rentTime;
@@ -35,6 +53,10 @@
@Schema(description = "鎷嗘満鏃堕棿")
@ExcelProperty("鎷嗘満鏃堕棿")
private LocalDateTime returnTime;
+
+ @Schema(description = "褰曞叆鏃堕棿")
+ @ExcelProperty("褰曞叆鏃堕棿")
+ private LocalDateTime entryTime;
@Schema(description = "骞叉壈鏁�")
@ExcelProperty("骞叉壈鏁�")
@@ -52,13 +74,13 @@
@ExcelProperty("澶囨敞")
private String remark;
- @Schema(description = "鍙栨秷瀹夎")
- @ExcelProperty("鍙栨秷瀹夎")
- private Integer cancelled;
+ @Schema(description = "鐘舵��")
+ @ExcelProperty("鐘舵��")
+ private Integer state;
- @Schema(description = "閬楀け")
- @ExcelProperty("鏄惁閬楀け")
- private Integer lost;
+ @Schema(description = "宸蹭粯娆�")
+ @ExcelProperty("宸蹭粯娆�")
+ private Integer paid;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
@@ -73,4 +95,62 @@
@Schema(description = "鍨嬪彿")
private String model;
+
+ @Schema(description = "璁惧鐘舵��")
+ private Integer devState;
+
+ // ==================== 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤� ====================
+ // 鍧囨潵鑷绾﹀崟 appointment锛坉ev_rent 琛ㄦ棤姝ゅ垪锛夛紝鐢� DevRentServiceImpl 鎸� applyNo 鍥炲～銆�
+ // 琛ラ綈杩欎簺瀛楁鍚庯紝棰嗙敤/瑁呮満/鎷嗘満/鏁版嵁褰曞叆/妫�鏌ヨ褰� 5 涓晫闈㈡墠鑳藉睍绀哄畬鏁存偅鑰呬俊鎭��
+
+ @Schema(description = "鎮ｈ�呮�у埆")
+ private Byte patGender;
+
+ @Schema(description = "鍑虹敓鏃ユ湡")
+ private LocalDate patBirthday;
+
+ @Schema(description = "鐧昏鏃堕棿")
+ private Date registerDate;
+
+ @Schema(description = "寮�鍗曞尰甯�")
+ private String doctor;
+
+ @Schema(description = "寮�鍗曟棩鏈燂紙寮�鍗曟椂闂达級")
+ private Date doctorTime;
+
+ @Schema(description = "鎮ｈ�呮潵婧愶細1闂ㄨ瘖 2鎬ヨ瘖 3浣忛櫌 4浣撴")
+ private Integer patSrc;
+
+ @Schema(description = "鎵嬫満鍙�")
+ private String patMobile;
+
+ @Schema(description = "鐢佃瘽")
+ private String patPhone;
+
+ @Schema(description = "鐥呭尯鍚嶇О")
+ private String patWardDesc;
+
+ @Schema(description = "鐥呭簥鍙�")
+ private String patBedNo;
+
+ @Schema(description = "灏辫瘖鍗″彿锛坢edical_card锛屽簱涓涓虹┖锛�")
+ private String medicalCard;
+
+ @Schema(description = "闂ㄨ瘖鍙凤紙瀹炴祴閮ㄥ垎鏁版嵁瀛樼殑鏄韩浠借瘉鍙凤紝闈炵湡姝ｅ崱鍙凤級")
+ private String outpatientNo;
+
+ @Schema(description = "韬唤璇佸彿")
+ private String patIdentityId;
+
+ /**
+ * 鍖诲槺鍙凤紙HIS 鎶ユ枃 observationRequest.id.item[root=2.16.156.10011.1.28].extension锛夈��
+ * 涓庛�岀敵璇峰崟鍙� applyNo銆嶄笉鍚岋細鍓嶈�呮槸鍖诲槺鏍囪瘑锛屽悗鑰呮槸鐢宠鍗曟爣璇嗐�傝鑺傜偣鍦ㄨ鑼冧腑闈炲繀椤婚」锛屽簱涓彲涓虹┖銆�
+ */
+ private String doctorAdviceNo;
+
+ @Schema(description = "澶氳�愯嵂锛�0鏃� 1澶氳�� 2澶氶噸鑰愯嵂")
+ private String tolerance;
+
+ @Schema(description = "鏄惁搴婅竟 0=鍚� 1=鏄�", example = "0")
+ private String isBedside;
}
\ No newline at end of file
--
Gitblit v1.9.3