From 4c141764d64c37c4c27e372cd55d9e861b192c28 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 18:06:49 +0800
Subject: [PATCH] 捐献基础增加入院时间,捐献上报基础增加入院时间
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 2b31817..f1e20a2 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
@@ -104,6 +104,7 @@
* 鍑虹敓鏃ユ湡
*/
@ApiModelProperty("鍑虹敓鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date birthday;
/**
@@ -571,9 +572,35 @@
@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("妗堜緥鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
+// @TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date donatetime;
@@ -613,5 +640,8 @@
@Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
private String coordinatorName;
-
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date entryTime;
}
--
Gitblit v1.9.3