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/dto/DonatebaseinfoProgressDTO.java | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
index e0a748a..4633e8c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
@@ -21,12 +21,28 @@
@ApiModel("鎹愮尞杩涘害鍩虹淇℃伅")
public class DonatebaseinfoProgressDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * Donatebaseinfo鐨処D
+ */
+ @ApiModelProperty("Donatebaseinfo鐨処D")
+ private Long id;
/**
* 娌荤枟鍖婚櫌
*/
@ApiModelProperty("娌荤枟鍖婚櫌")
private String treatmenthospitalno;
+
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientNo;
+
+ @ApiModelProperty("鎵╁睍鍐呭")
+ @Excel(name = "鎵╁睍鍐呭")
+ private String extracontent;
/**
* 鎵�鍦ㄥ尰鐤楁満鏋�
@@ -77,10 +93,28 @@
private Long age;
/**
+ * 宸ヤ綔娴�
+ */
+ @ApiModelProperty("宸ヤ綔娴�:1.渚涜�呯淮鎶� 2.鎹愮尞鎰忔効 3.鍖诲璇勪及 4.姝讳骸鍒ゅ畾 5.浼︾悊瀹℃煡 6.鍣ㄥ畼鍒嗛厤 7.鍣ㄥ畼鍒╃敤 99.鎹愮尞瀹屾垚")
+ private Long workflow;
+
+ /**
* 骞撮緞鍗曚綅
*/
@ApiModelProperty("骞撮緞鍗曚綅")
private String ageunit;
+
+ /**
+ * 浼犳煋鐥呮儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呮儏鍐�")
+ private String infectious;
+
+ /**
+ * 浼犳煋鐥呭叾瀹冩儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呭叾瀹冩儏鍐�")
+ private String infectiousOther;
/**
* 琛�鍨�
@@ -118,32 +152,21 @@
/**
- * 绗竴娆¤瘎浼版椂闂�
+ * 璇勪及鐘舵�侊細1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃
*/
- @ApiModelProperty("绗竴娆¤瘎浼版椂闂�")
+ @ApiModelProperty("璇勪及鐘舵�侊細1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 ")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "绗竴娆¤瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date assessFirstTime;
+ @Excel(name = "璇勪及鐘舵�侊細1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private String assessState;
/**
- * 绗簩娆¤瘎浼版椂闂�
+ * 璇勪及鏃堕棿
*/
- @ApiModelProperty("绗簩娆¤瘎浼版椂闂�")
+ @ApiModelProperty("璇勪及鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "绗簩娆¤瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date assessSecondTime;
+ @Excel(name = "璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessTime;
- /**
- * 绗竴娆¤瘎浼扮粨璁�
- */
- @ApiModelProperty("绗竴娆¤瘎浼扮粨璁�")
- private String firstAssessState;
-
- /**
- * 绗簩娆¤瘎浼扮粨璁�
- */
- @ApiModelProperty("绗簩娆¤瘎浼扮粨璁�")
- private String secondAssessState;
/**
* 浜插睘纭鏃堕棿
@@ -193,4 +216,15 @@
@ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
@Excel(name = "缁堟妗堜緥")
private Integer terminationCase;
+
+
+ @ApiModelProperty("缁堟妗堜緥鍘熷洜")
+ @Excel(name = "缁堟妗堜緥")
+ private Integer terminationResult;
+
+
+ @ApiModelProperty("缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ @Excel(name = "缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ private Integer terminationType;
+
}
--
Gitblit v1.9.3