From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java
index 20d1baa..bb00dfa 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java
@@ -8,6 +8,7 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鍖诲璇勪及瀵硅薄 service_medicalevaluation
@@ -16,7 +17,7 @@
  * @date 2021-11-19
  */
 @Data
-@ApiModel("鍖诲璇勪及鍩虹淇℃伅")
+@ApiModel("鍖诲璇勪及鍩虹淇℃伅鍝嶅簲瀵硅薄")
 public class MedicalevaluationBaseInfoDTO {
     private static final long serialVersionUID = 1L;
 
@@ -25,6 +26,11 @@
      */
     @ApiModelProperty("鍖诲璇勪及鐨刬d")
     private Long id;
+
+    /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+    @ApiModelProperty("鎹愮尞绫诲埆")
+    @Excel(name = "鎹愮尞绫诲埆")
+    private String donationcategory;
 
     /**
      *
@@ -110,32 +116,19 @@
 
 
     /**
-     * 棣栨璇勪及鏃堕棿
+     * 璇勪及鏃堕棿
      */
-    @ApiModelProperty("棣栨璇勪及鏃堕棿")
+    @ApiModelProperty("璇勪及鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "棣栨璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date assessFirstTime;
+    @Excel(name = "璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date assessTime;
 
 
     /**
-     * 璇勪及鐘舵�侊細   棣栨锛�1.璇勪及閫氳繃  2璇勪及涓嶉�氳繃
+     * 璇勪及鐘舵�侊細寰呰瘎浼般�佽瘎浼颁腑銆佸凡瀹屾垚
      */
-    @ApiModelProperty("璇勪及鐘舵�侊細   棣栨锛�1.璇勪及閫氳繃  2璇勪及涓嶉�氳繃     ")
-    private String firstAssessState;
-
-    /**
-     * 璇勪及鐘舵�侊細   棣栨锛�1.璇勪及閫氳繃  2璇勪及涓嶉�氳繃
-     */
-    @ApiModelProperty("璇勪及鐘舵�侊細  鍐嶆锛�1.璇勪及閫氳繃  2璇勪及涓嶉�氳繃")
-    private String secondAssessState;
-    /**
-     * 浜屾璇勪及鏃堕棿
-     */
-    @ApiModelProperty("浜屾璇勪及鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "浜屾璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date assessSecondTime;
+    @ApiModelProperty("璇勪及鐘舵�侊細1.寰呰瘎浼般��2.璇勪及涓��3.宸插畬鎴�   ")
+    private String assessState;
 
     /**
      * 璇勪及闄勪欢
@@ -147,7 +140,7 @@
      * 鍣ㄥ畼璇勪及璇︽儏
      */
     @ApiModelProperty("鍣ㄥ畼璇勪及璇︽儏")
-    private ServiceMedicalevaluationorgan serviceMedicalevaluationorgan;
+    private List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans;
 
 
 }

--
Gitblit v1.9.3