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/ServiceDonatebaseinfo.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index dd13680..ad330de 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -1,5 +1,6 @@
 package com.ruoyi.project.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -103,7 +104,6 @@
      * 鍑虹敓鏃ユ湡
      */
     @ApiModelProperty("鍑虹敓鏃ユ湡")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date birthday;
 
     /**
@@ -557,7 +557,7 @@
     private String businessarea;
 
 
-    @ApiModelProperty("闄勪欢鍦板潃")
+    @ApiModelProperty("闄勪欢鍦板潃锛堜緵鑰呰瘎浼板悇椤硅褰曪級")
     @Excel(name = "闄勪欢鍦板潃")
     private String annexfiles;
 
@@ -571,9 +571,36 @@
     @Excel(name = "缁堟妗堜緥")
     private Integer terminationCase;
 
+
+    @ApiModelProperty("缁堟鍘熷洜锛�1濂借浆   2姝讳骸   3涓嶇鍚堟崘鐚爣鍑�  4瀹跺睘鏀惧純鎹愮尞  5鍏跺畠")
+    @Excel(name = "缁堟鍘熷洜锛�1濂借浆   2姝讳骸   3涓嶇鍚堟崘鐚爣鍑�  4瀹跺睘鏀惧純鎹愮尞  5鍏跺畠")
+    private Integer terminationType;
+
+
+    @ApiModelProperty("缁堟绫诲瀷锛�0寮�鍚紝1缁堟    榛樿鍊硷細0")
+    @Excel(name = "缁堟绫诲瀷")
+    private String terminationResult;
+
+    @ApiModelProperty("鎵╁睍鍐呭")
+    @Excel(name = "鎵╁睍鍐呭")
+    private String extracontent;
+
+
+    @ApiModelProperty("褰撳墠鍖婚櫌")
+    @Excel(name = "褰撳墠鍖婚櫌")
+    private String currentHospital;
+
+
+    @ApiModelProperty("涓婃姤鍖婚櫌")
+    @Excel(name = "涓婃姤鍖婚櫌")
+    private String reportHospital;
+
+    /**
+     * 妗堜緥鏃堕棿
+     */
     @ApiModelProperty("妗堜緥鏃堕棿")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date donatetime;
 
     @ApiModelProperty("妗堜緥搴忓彿")

--
Gitblit v1.9.3