From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 8 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
index b667458..bdba5c7 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
@@ -1,10 +1,19 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment.vo;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
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 io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.time.LocalDateTime;
import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -15,6 +24,12 @@
@ToString(callSuper = true)
public class AppointmentPageReqVO extends PageParam {
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
+
+ @Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
+ private String episodeId;
+
@Schema(description = "鎮ｈ�呯紪鍙�", example = "29034")
private String patId;
@@ -22,7 +37,7 @@
private String patName;
@Schema(description = "鎮ｈ�呮�у埆")
- private Boolean patGender;
+ private Byte patGender;
@Schema(description = "鎮ｈ�呯敓鏃�")
private LocalDateTime patBirthday;
@@ -54,11 +69,21 @@
@Schema(description = "搴婂彿")
private String patBedNo;
- @Schema(description = "棰勭害缂栧彿", example = "27849")
- private String bookId;
-
@Schema(description = "棰勭害鏃ユ湡")
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
+
+ /**
+ * 銆愭湰闇�姹傘�戦绾︽棩鏈�**鏃堕棿娈�**鏌ヨ锛氳捣濮嬶紙鍚綋澶� 00:00:00锛夈��
+ * <p>鍓嶇銆岄绾︽棩鏈熴�嶇敤鏃ユ湡鑼冨洿閫夋嫨鍣紝鏌ヨ鏃舵媶鎴� start(00:00:00) / end(23:59:59) 涓や釜鍙傛暟锛�
+ * 涓庢棦鏈夌殑 {@code registerDateStart/End}銆亄@code createTimeStart/End} 鍐欐硶淇濇寔涓�鑷淬��
+ */
+ @Schema(description = "棰勭害鏃ユ湡-寮�濮嬶紙鍚級", example = "2026-11-01 00:00:00")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime bookDateStart;
+
+ @Schema(description = "棰勭害鏃ユ湡-缁撴潫锛堝惈锛�", example = "2026-11-30 23:59:59")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime bookDateEnd;
@Schema(description = "棰勭害鏃堕棿娈�")
private Integer bookTimeslot;
@@ -68,9 +93,75 @@
private LocalDateTime[] bookTime;
@Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "2")
- private Boolean bookCheckType;
+ private Integer bookCheckType;
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
- private String bookSrc;
+ private Integer bookSrc;
-}
\ No newline at end of file
+ @Schema(description = "鐢宠鍗曠姸鎬�")
+ private String[] status;
+
+ @Schema(description = "宸蹭粯娆�")
+ private Integer paid;
+
+ /**
+ * 鐧昏鏃堕棿
+ */
+ private Date registerDate;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime registerDateStart;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime registerDateEnd;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private LocalDateTime createTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTimeStart;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTimeEnd;
+
+ /**
+ * 鐧昏鏃堕棿锛堟煡璇㈡潯浠讹級
+ */
+ private String registerTime;
+
+ private String tolerance;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ private String hospitalNo;
+
+ /**
+ * 鍖讳繚鍗″彿
+ */
+ private String medicalCard;
+
+ /**
+ * 闂ㄨ瘖鍙�
+ */
+ private String outpatientNo;
+
+ /**
+ * 鏍规嵁鍒涘缓鏃堕棿鍊掑簭
+ */
+ private String orderCreateTime;
+
+ /**
+ * 寮�鍗曞尰鐢�
+ */
+ private String doctor;
+
+ /**
+ * 寮�鍗曞尰鐢熺紪鐮�
+ */
+ private String doctorCode;
+
+ /**
+ * 寮�鍗曟椂闂�
+ */
+ private java.util.Date doctorTime;
+
+}
--
Gitblit v1.9.3