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/appointment/vo/AppointmentRespVO.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
index 340247a..5fabb13 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
@@ -3,10 +3,16 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+// 娉ㄦ剰锛氬師涓� java.sql.Date锛堝彧琛ㄧず鏃ユ湡锛夛紝浼氳 registerDate/doctorTime 涓㈠け鏃跺垎绉掋��
+// 2026-09-30 涓� AppointmentSaveReqVO/AppointmentDO 缁熶竴涓� java.util.Date銆�
+import java.util.Date;
import java.time.LocalDate;
import java.util.*;
+
import org.springframework.format.annotation.DateTimeFormat;
+
import java.time.LocalDateTime;
+
import com.alibaba.excel.annotation.*;
import cn.lihu.jh.framework.excel.core.annotations.DictFormat;
import cn.lihu.jh.framework.excel.core.convert.DictConvert;
@@ -96,6 +102,7 @@
private LocalDateTime bookTime;
@Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @DictFormat("ecg_check_type")
@ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class)
private Integer bookCheckType;
@@ -104,23 +111,39 @@
private Integer bookSeqNum;
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
+// @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
private Integer bookSrc;
- @Schema(description = "宸蹭粯娆�")
- @ExcelProperty("宸蹭粯娆�")
+ @Schema(description = "宸蹭粯娆� 0-鏈氦璐� 1-宸茬即璐�")
+ @DictFormat("ecg_pay_type")
+ @ExcelProperty(value = "浠樻鐘舵��", converter = DictConvert.class)
private Integer paid;
// @TableField(exist = false)
+ @Schema(description = "鐘舵��")
+ @DictFormat("ecg_status_type")
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
private String status;
+
+
+ /**
+ * 鐧昏鏃堕棿
+ */
+ @Schema(description = "鐧昏鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鐧昏鏃堕棿")
+ private Date registerDate;
/**
* 鑰愯嵂鎬э細 鏄惁澶氳��1浠ｈ〃鏄紝0浠ｈ〃涓嶆槸
*/
private String tolerance;
+ @Schema(description = "鏄惁搴婅竟 0=鍚� 1=鏄�", example = "0")
+ @ExcelProperty("鏄惁搴婅竟")
+ private String isBedside;
+
/**
- *浣忛櫌鍙�
+ * 浣忛櫌鍙�
*/
private String hospitalNo;
@@ -133,4 +156,58 @@
* 闂ㄨ瘖鍙�
*/
private String outpatientNo;
+
+ private LocalDateTime createTime;
+
+ /**
+ * 寮�鍗曞尰鐢�
+ */
+ private String doctor;
+
+ /**
+ * 寮�鍗曞尰鐢熺紪鐮�
+ */
+ private String doctorCode;
+
+ /**
+ * 寮�鍗曟椂闂�
+ */
+ @ExcelProperty("寮�鍗曟椂闂�")
+ private Date doctorTime;
+
+ // ==================== HIS 鎺ュ叆琛ュ厖瀛楁锛�2026-09-27 闅忚〃鏂板鍒椾竴璧峰姞鍏ワ級 ====================
+ // 娉細bookSeqNum 宸插湪涓婃柟澹版槑锛屾澶勪笉閲嶅瀹氫箟
+
+ /**
+ * 浼樺厛绾� / 鍔犳�ユ爣璁帮細N=甯歌锛孞=鍔犳��
+ */
+ @ExcelProperty("鍔犳�ユ爣璁�")
+ private String jjbz;
+
+ /**
+ * 妫�鏌ユ柟寮忕紪鐮�
+ */
+ private String methodCode;
+
+ /**
+ * 妫�鏌ラ儴浣嶇紪鐮�
+ */
+ private String targetSiteCode;
+
+ /**
+ * 鍖诲槺鍙凤紙HIS 鎶ユ枃 component2.observationRequest.id.item[root=2.16.156.10011.1.28].extension锛夈��
+ * 涓庛�岀敵璇峰崟鍙� applyNo銆嶄笉鍚岋細鍓嶈�呮槸鍖诲槺鏍囪瘑锛屽悗鑰呮槸鐢宠鍗曟爣璇嗐��
+ */
+ private String doctorAdviceNo;
+
+ /**
+ * 妫�鏌ユ埧闂村悕绉�
+ */
+ private String roomName;
+
+ /**
+ * 娉ㄦ剰浜嬮」
+ */
+ private String remark;
+
}
--
Gitblit v1.9.3