From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 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..9122447 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;
@@ -27,11 +28,30 @@
private Long id;
/**
+ * 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
*
*/
@ApiModelProperty("baseInfo鐨刬d")
private Long infoid;
+ /**
+ * 鎵╁睍鍐呭
+ */
+ @ApiModelProperty("鎵╁睍鍐呭")
+ @Excel(name = "鎵╁睍鍐呭")
+ private String extracontent;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
/**
* 璁板綍鐘舵��
@@ -67,6 +87,12 @@
*/
@ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
private String treatmenthospitalno;
+
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
+ @ApiModelProperty("鎹愮尞鑰呭鍚�")
+ private String name;
/**
* 鎬у埆
@@ -110,32 +136,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 +160,7 @@
* 鍣ㄥ畼璇勪及璇︽儏
*/
@ApiModelProperty("鍣ㄥ畼璇勪及璇︽儏")
- private ServiceMedicalevaluationorgan serviceMedicalevaluationorgan;
+ private List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans;
}
--
Gitblit v1.9.3