From 2359f47c2f89a9867e72aa9b171cb118b874afec Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:29:21 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 6 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 38bb14c..7dcc24d 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;
@@ -74,14 +75,14 @@
     /**
      * 骞撮緞
      */
-    @TableField(exist = false)
+//    @TableField(exist = false)
     @ApiModelProperty("骞撮緞")
     private Long age;
 
     /**
      * 骞撮緞鍗曚綅
      */
-    @TableField(exist = false)
+//    @TableField(exist = false)
     @ApiModelProperty("骞撮緞鍗曚綅")
     private String ageunit;
     /**
@@ -501,7 +502,13 @@
      * 淇℃伅鍛樺鍚�
      */
     @ApiModelProperty("淇℃伅鍛樺鍚�")
-    private String infoname;
+    private String infoName;
+
+    /**
+     * 淇℃伅鍛樺鍚�
+     */
+    @ApiModelProperty("淇℃伅鍛樼紪鍙�")
+    private String infoNo;
 
     /**
      * 淇℃伅鍛樿仈绯绘柟寮�
@@ -551,7 +558,7 @@
     private String businessarea;
 
 
-    @ApiModelProperty("闄勪欢鍦板潃")
+    @ApiModelProperty("闄勪欢鍦板潃锛堜緵鑰呰瘎浼板悇椤硅褰曪級")
     @Excel(name = "闄勪欢鍦板潃")
     private String annexfiles;
 
@@ -565,9 +572,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("妗堜緥搴忓彿")
@@ -585,5 +619,26 @@
     @ApiModelProperty("棣栨鍖荤枟鏈烘瀯绉戝")
     private String firstDept;
 
+    /**
+     * GSC璇勫垎
+     */
+    @ApiModelProperty("GSC璇勫垎")
+    @Excel(name = "GSC璇勫垎", readConverterExp = "GSC璇勫垎")
+    private String gcsScore;
+
+    /**
+     * 鍗忚皟鍛樼紪鍙�
+     */
+    @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
+    @Excel(name = "鍗忚皟鍛樼紪鍙�", readConverterExp = "鍗忚皟鍛樼紪鍙�")
+    private String coordinatorNo;
+
+    /**
+     * 鍗忚皟鍛樺鍚�
+     */
+    @ApiModelProperty("鍗忚皟鍛樺鍚�")
+    @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+    private String coordinatorName;
+
 
 }

--
Gitblit v1.9.3