From 2d7a2367a2dad1d9a2a8306a05ca08d7951d20ee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 10 十月 2026 09:35:43 +0800
Subject: [PATCH] 查询增加捐献类别字段,住院号
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java | 7 +++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java | 7 +++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 1 +
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 1 +
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 1 +
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 1 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java | 7 +++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java | 7 +++++++
8 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
index fafd088..911d43e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
@@ -21,6 +21,13 @@
private static final long serialVersionUID = 1L;
/**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
* baseInfo鐨処D
*/
@ApiModelProperty("baseInfo鐨処D")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
index 7977b66..14a63a6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
@@ -22,6 +22,13 @@
private static final long serialVersionUID = 1L;
/**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
* 璁板綍鐘舵��
*/
@ApiModelProperty("璁板綍鐘舵��")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
index fcae590..5ccdeee 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
@@ -17,6 +17,13 @@
public class RelativeConfirmationBaseInfoDTO {
/**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
* baseInfo鐨処D
*/
@ApiModelProperty("baseInfo鐨処D")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java
index 880ef6f..ecf648a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java
@@ -22,6 +22,13 @@
private static final long serialVersionUID = 1L;
/**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
* 璁板綍鐘舵��
*/
@ApiModelProperty("璁板綍鐘舵��")
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index 9e0f036..038c6aa 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -95,6 +95,7 @@
sd.case_no AS caseNo,
sd.InpatientNo AS inpatientno,
sd.extracontent AS extracontent,
+ sd.DonationCategory as donationcategory,
sd.Name AS NAME,
sd.RecordState AS recordstate,
sd.Sex AS sex,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index d32059a..3a9b98f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -185,6 +185,7 @@
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
sd.case_no AS caseNo,
+ sd.InpatientNo AS inpatientno,
sd.extracontent AS extracontent,
sd.DonationCategory as donationcategory,
sd.NAME AS name,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index ab03a42..1ed4610 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -202,6 +202,7 @@
sb.TreatmentHospitalName,
sb.TreatmentHospitalNo,
sb.DonationCategory as donationcategory,
+ sb.InpatientNo AS inpatientno,
sb.DonorNo,
sb.case_no,
sb.Name,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 512ed25..8c48d78 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -276,6 +276,7 @@
sd.InpatientNo as inpatientno,
sd.extracontent as extracontent,
sd.RecordState as recordstate,
+ sd.DonationCategory as donationcategory,
sd.Sex as sex,
sd.Age as age,
sd.BloodType as bloodtype,
--
Gitblit v1.9.3