From 2a3af1e765722cae585967c0010d90acef077aee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 25 五月 2026 17:41:54 +0800
Subject: [PATCH] 捐献基础表新增归档时间 捐献亲属确认表新增其他亲属 供体维护记录新增住院号排序，新增年龄区间、入院区间，协调员查询 捐献亲属确认修改住院号排序 医学评估表新增住院号排序，新增评估时间区间查询 患者死亡信息增住院号排序，新增死亡时间区间查询 伦理审查发起表增住院号排序，新增发起时间区间查询 捐献器官分配基础表表增住院号排序，新增分配状态，分配时间区间查询 捐献完成表增住院号排序，新增分配状态查询
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 5 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java | 5 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java | 4 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java | 10 +++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml | 7 +++
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 3 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 2 +
ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class | 0
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 5 ++
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 4 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java | 8 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java | 3 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 2 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java | 11 +++++
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 5 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MedicalEvaluationWithBaseInfoVO.java | 12 ++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 8 +++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java | 8 ++++
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 5 +-
19 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class
index 3d480af..e7b4be7 100644
--- a/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class
Binary files differ
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 f1e20a2..2ca2b02 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
@@ -644,4 +644,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date entryTime;
+
+ @ApiModelProperty("褰掓。鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date filingTime;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 287dbe2..988cb2e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -308,5 +308,10 @@
@ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
@Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String state;
+
+
+ @ApiModelProperty("鍏朵粬浜插睘")
+ @Excel(name = "鍏朵粬浜插睘")
+ private String otherFamilyMembers;
}
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 024cdc4..fcae590 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
@@ -299,4 +299,9 @@
@ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
@Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String state;
+
+
+ @ApiModelProperty("鍏朵粬浜插睘")
+ @Excel(name = "鍏朵粬浜插睘")
+ private String otherFamilyMembers;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java
index b05e8e0..d69a10f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java
@@ -186,5 +186,16 @@
@Excel(name = "璐熻矗浜哄鍚�")
private String responsibleusername;
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
+
+ @ApiModelProperty("寮�濮嬫浜℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startDeathtime;
+
+ @ApiModelProperty("缁撴潫姝讳骸鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endDeathtime;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
index 602dadb..62ed283 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
@@ -149,5 +149,13 @@
@Excel(name = "鐧昏鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date registrationTime;
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java
index 704a05a..e4d3aed 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java
@@ -127,4 +127,8 @@
*/
@ApiModelProperty("鎹愮尞鍣ㄥ畼绉绘璇︽儏")
private List<ServiceDonatecomporgan> serviceDonatecomporganList;
+
+ @ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String completeState;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java
index c5d3a4e..807285b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java
@@ -267,5 +267,8 @@
@Excel(name = "鎵╁睍")
private String extContent;
+ @ApiModelProperty("瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ private String witnessState;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
index 96ae538..d38b547 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
@@ -175,5 +175,15 @@
@ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
@Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String state;
+
+ @ApiModelProperty("寮�濮嬪叆闄㈡椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startEntryTime;
+
+ @ApiModelProperty("缁撴潫鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endEntryTime;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MedicalEvaluationWithBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MedicalEvaluationWithBaseInfoVO.java
index 869a3a0..8c28479 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MedicalEvaluationWithBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MedicalEvaluationWithBaseInfoVO.java
@@ -137,4 +137,16 @@
@ApiModelProperty("璇勪及闄勪欢")
private String assessannex;
+ @ApiModelProperty("褰撴湡鍖荤枟鏈烘瀯")
+ private String currentMedicalInstitution;
+
+ @ApiModelProperty("寮�濮嬭瘎浼版椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startAssessTime;
+
+ @ApiModelProperty("缁撴潫璇勪及鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endAssessTime;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java
index de014f2..cc3a572 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java
@@ -152,5 +152,13 @@
@ApiModelProperty("鍙戣捣涓婚")
@Excel(name = "鍙戣捣涓婚")
private String initiateTheme;
+
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index af68ab4..8bf3afe 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -149,8 +149,11 @@
<if test="responsibleusername != null and responsibleusername != ''">and sd.ResponsibleUserName like
concat('%',#{responsibleusername}, '%')
</if>
-
+ <if test="state != null and state != ''">and sdi.state = #{state}</if>
+ <if test="startDeathtime != null and endDeathtime != null ">and sdi.DeathTime BETWEEN #{startDeathtime} and #{endDeathtime}</if>
</where>
+
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 51fb2f7..d32059a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -223,7 +223,9 @@
<if test="inpatientno != null and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
<if test="donorno != null and donorno != ''">and sdc.DonorNo = #{donorno}</if>
<if test="infoid != null">and sd.id = #{infoid}</if>
+ <if test="completeState != null and completeState != ''">and sdc.complete_state = #{completeState}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index 6a74211..a44a591 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -64,7 +64,8 @@
sdm.item_time as itemTime,
sdt.DeathTime as deathTime,
sdm.item_desc as itemDesc,
- sdm.state
+ sdm.state,
+ entry_time
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID
@@ -78,6 +79,8 @@
<if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
<if test="caseNo != null and caseNo != ''">and case_no = #{caseNo}</if>
<if test="reportTime != null ">and ReportTime = #{reportTime}</if>
+ <if test="startEntryTime != null and endEntryTime != null ">and entry_time BETWEEN #{startEntryTime} and #{endEntryTime}</if>
+ <if test="startAge != null and endAge != null ">and age BETWEEN #{startAge} and #{endAge}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="coordinatorName != null and coordinatorName != ''">and coordinator_name like concat('%', #{coordinatorName}, '%')</if>
@@ -86,8 +89,11 @@
<if test="itemTime != null ">and item_time = #{itemTime}</if>
<if test="itemDesc != null and itemDesc != ''">and item_desc = #{itemDesc}</if>
<if test="id != null ">and sdt.id = #{id}</if>
+ <if test="state != null and state != ''">and sdm.state = #{state}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+
</select>
</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index 7b7e3d4..53557ef 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -98,7 +98,7 @@
sd.termination_case = 0
<if test="donorno != null and donorno != ''">and sd.DonorNo = #{donorno}</if>
<if test="infoid != null ">and sd.ID = #{infoid}</if>
- <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
+
<if test="treatmenthospitalname != null and treatmenthospitalname != ''">and sd.treatmenthospitalname like
concat('%', #{treatmenthospitalname}, '%')
</if>
@@ -121,7 +121,12 @@
<if test="registrationCode != null and registrationCode != ''">
and sdb.registration_code = #{registrationCode}
</if>
+ <if test="allocationStatus != null and allocationStatus != ''">
+ and sdb.allocation_status = #{allocationStatus}
+ </if>
+ <if test="startTime != null and endTime != null ">and sdb.allocation_time BETWEEN #{startTime} and #{endTime}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index de7c323..a930bb3 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -179,7 +179,9 @@
<if test="operationdoctor != null and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}
</if>
<if test="infoid != null">and sd.ID = #{infoid}</if>
+ <if test="witnessState != null">and st.witness_state = #{witnessState}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 25006b3..0d0b795 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -115,13 +115,16 @@
sd.termination_case = 0
<if test="infoid != null ">and sd.id = #{infoid}</if>
<if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
+ <if test="name != null and name != ''">and sd.name like concat('%', #{name}, '%')</if>
<if test="caseNo != null and caseNo != ''">and sd.case_no = #{caseNo}</if>
<if test="expertConclusion != null ">and se.expert_conclusion = #{expertConclusion}</if>
<if test="expertName != null ">and se.expert_name = #{expertName}</if>
<if test="expertOpinion != null ">and se.expert_opinion = #{expertOpinion}</if>
<if test="expertTime != null ">and se.expert_time = #{expertTime}</if>
<if test="status != null ">and se.status = #{status}</if>
+ <if test="startTime != null and endTime != null ">and se.start_time BETWEEN #{startTime} and #{endTime}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index 6f5f0bd..3c927aa 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -226,11 +226,13 @@
sb.termination_case = 0
<if test="infoid != null">AND sb.ID = #{infoid}</if>
<if test="inpatientno != null">AND sb.InpatientNo = #{inpatientno}</if>
+ <if test="urrentMedicalInstitution != null">AND sb.current_medical_institution = #{urrentMedicalInstitution}</if>
<if test="caseNo != null and caseNo != ''">AND sm.case_no = #{caseNo}</if>
<if test="donorno != null and donorno != ''">AND sm.DonorNo = #{donorno}</if>
<if test="diagnosisname != null and diagnosisname != ''">AND sm.DiagnosisName = #{diagnosisname}</if>
<if test="assessState != null and assessState != ''">AND sm.assess_state = #{assessState}</if>
<if test="assessTime != null ">AND sm.assess_time = #{assessTime}</if>
+ <if test="startAssessTime != null and endAssessTime != null ">and assess_time BETWEEN #{startAssessTime} and #{endAssessTime}</if>
<if test="name != null and name != ''">AND sb.Name LIKE CONCAT('%', #{name}, '%')</if>
<if test="sex != null and sex != ''">AND sb.Sex = #{sex}</if>
<if test="idcardno != null and idcardno != ''">AND sb.IDCardNo = #{idcardno}</if>
@@ -242,6 +244,8 @@
#{treatmenthospitalname}
</if>
</where>
+ order by sd.InpatientNo desc
+
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 3bddf6f..512ed25 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -308,7 +308,8 @@
sr.education as education,
sr.relativeconfirmationsignname,
sr.relativeidcardno,
- sr.state
+ sr.state,
+ sr.other_family_members
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
@@ -338,7 +339,7 @@
and sr.SignDate <= #{endSigndate}
</if>
</where>
- order by sr.id desc,sd.id desc
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3