From c121dc8d2d5b56c17efe7e53e7ef3505387169c7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 21 五月 2026 15:27:43 +0800
Subject: [PATCH] 转运附件数据不对
---
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index 7a6a1ee..b0f20e7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -141,20 +141,23 @@
service_ethicalreviewopinions.start_time,
service_ethicalreviewopinions.end_time,
service_ethicalreviewopinions.expert_type,
+ c.file_patch,
service_ethicalreviewopinions.sigin as sigin
FROM service_donatebaseinfo
LEFT JOIN service_ethicalreviewopinions
ON service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
LEFT JOIN base_organization ON
base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
-
+ left join service_ethicalreviewinitiate c on c.InfoID=service_donatebaseinfo.id
<where>
service_donatebaseinfo.del_flag=0
and service_ethicalreviewopinions.del_flag=0
<if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
- <if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
+ <if test="name != null and name != ''">
+ and (`service_donatebaseinfo`.`Name` like concat('%', #{name}, '%') or `service_donatebaseinfo`.`InpatientNo` like concat('%', #{name}, '%'))
</if>
<if test="idcardno != null and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+ <if test="inpatientno != null and inpatientno != ''">and `service_donatebaseinfo`.`InpatientNo` = #{inpatientno}</if>
<if test="treatmenthospitalno != null and treatmenthospitalno != ''">and
`service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
</if>
@@ -231,4 +234,20 @@
</select>
+ <select id="stateTotalAll" resultType="com.ruoyi.project.domain.vo.EthicalreviewopinionsStateTotalVO">
+ SELECT COUNT(*) count,SUM(CASE WHEN receive_status = 5 THEN 1 ELSE 0 END) AS throughCount,
+ SUM(CASE WHEN receive_status =4 THEN 1 ELSE 0 END) AS rejectCount,
+ SUM(CASE WHEN receive_status =3 THEN 1 ELSE 0 END) AS waiveCount,
+ SUM(CASE WHEN receive_status =2 THEN 1 ELSE 0 END) AS disagreeCount,
+ SUM(CASE WHEN receive_status =1 THEN 1 ELSE 0 END) AS agreeCount,
+ SUM(CASE WHEN receive_status !=0 THEN 1 ELSE 0 END) AS inCount
+
+ FROM service_ethicalreviewopinions
+ <where>
+ <if test="nitiateId != null ">nitiate_id = #{nitiateId}</if>
+ </where>
+
+
+ </select>
+
</mapper>
--
Gitblit v1.9.3