From 73f5b82df781d2b061ba24d29182f6898b5535d9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 28 十二月 2025 14:34:04 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index 3224b47..8003453 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -86,8 +86,8 @@
* 鍑虹敓鏃ユ湡
*/
@ApiModelProperty("鍑虹敓鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date birthday;
/**
@@ -291,14 +291,14 @@
*/
@ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
@Excel(name = "鎶ュ憡鑰呯紪鍙�")
- private String reporterno;
+ private String infoNo;
/**
* 鎶ュ憡鑰呭鍚�
*/
@ApiModelProperty("鎶ュ憡鑰呭鍚�")
@Excel(name = "鎶ュ憡鑰呭鍚�")
- private String reportername;
+ private String infoName;
/**
* 鎶ュ憡鑰呰仈绯荤數璇�
@@ -323,20 +323,6 @@
private Integer terminationCase;
/**
- * 鑱旂郴浜猴紙鍗忚皟鍛樼紪鍙凤級
- */
- @ApiModelProperty("鑱旂郴浜猴紙鍗忚皟鍛橈級")
- @Excel(name = "鑱旂郴浜猴紙鍗忚皟鍛樼紪鍙凤級", readConverterExp = "鍗�=璋冨憳")
- private String userNo;
-
- /**
- * 鑱旂郴浜猴紙鍗忚皟鍛樺鍚嶏級
- */
- @ApiModelProperty("鑱旂郴浜猴紙鍗忚皟鍛橈級")
- @Excel(name = "鑱旂郴浜猴紙鍗忚皟鍛樺鍚嶏級", readConverterExp = "鍗�=璋冨憳")
- private String userName;
-
- /**
* 鑱旂郴浜猴紙鍗忚皟鍛樺鍚嶏級
*/
@ApiModelProperty("閮ㄩ棬缂栧彿")
@@ -355,7 +341,21 @@
*/
@ApiModelProperty("GSC璇勫垎")
@Excel(name = "GSC璇勫垎", readConverterExp = "GSC璇勫垎")
- private String gscScore;
+ private String gcsScore;
+
+ /**
+ * 琛�鍨� 鏍规嵁瀛楀吀sys_BloodType
+ */
+ @ApiModelProperty("琛�鍨� 鏍规嵁瀛楀吀sys_BloodType")
+ @Excel(name = "琛�鍨� 鏍规嵁瀛楀吀sys_BloodType", readConverterExp = "琛�鍨� 鏍规嵁瀛楀吀sys_BloodType")
+ private String bloodType;
+
+ /**
+ * 琛�鍨� 鏍规嵁瀛楀吀sys_BloodType
+ */
+ @ApiModelProperty("Rh闃存�� 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "Rh闃存�� 0锛氬惁锛�1锛氭槸", readConverterExp = "Rh闃存�� 0锛氬惁锛�1锛氭槸")
+ private String rhYin;
/**
* 鏄惁闇�瑕佽浆杩� 1锛氫笉闇�瑕� 2闇�瑕� 榛樿1
@@ -389,5 +389,19 @@
@ApiModelProperty("杞繍淇℃伅")
private List<ServiceTransport> serviceTransport;
+ /**
+ * 鍗忚皟鍛樼紪鍙�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�", readConverterExp = "鍗忚皟鍛樼紪鍙�")
+ private String coordinatorNo;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
}
--
Gitblit v1.9.3