From e81923546701f9aa0121cbebd3309ea228e122d4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 14 三月 2024 17:35:47 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java            |   22 +++++++++++-----------
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |    3 +++
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml    |    4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
index dcd24d3..564627a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
@@ -41,17 +41,17 @@
     @ApiModelProperty("deptname")
     private String deptname;
 
-//    /**
-//     * reporterno
-//     */
-//    @ApiModelProperty("reporterno")
-//    private String reporterno;
-//
-//    /**
-//     * reportername
-//     */
-//    @ApiModelProperty("reportername")
-//    private String reportername;
+    /**
+     * reporterno
+     */
+    @ApiModelProperty("reporterno")
+    private String reporterno;
+
+    /**
+     * reportername
+     */
+    @ApiModelProperty("reportername")
+    private String reportername;
 
     /**
      * casesum
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index d7f4e90..83a05fc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -113,6 +113,9 @@
             <if test="residenceprovince != null  and residenceprovince != ''">and ResidenceProvince =
                 #{residenceprovince}
             </if>
+            <if test="terminationCase != null">and termination_case =
+                #{terminationCase}
+            </if>
             <if test="residenceprovincename != null  and residenceprovincename != ''">and ResidenceProvinceName like
                 concat('%', #{residenceprovincename}, '%')
             </if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 55cf5c7..142d674 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -506,13 +506,13 @@
           and OrganGetTime &lt;= #{endtime}
     </select>
     <select id="getDistinctOrgansCount" resultType="java.lang.Integer">
-        select count(*) from service_donateorgan d
+        select count(*) from service_donationwitnessorgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
         inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where d.OrganNo = #{organno}
         -- and (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
         and d.del_flag=0
-        and d.OrganGetTime IS NOT NULL
+--         and d.OrganGetTime IS NOT NULL
         <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
         <if test="endtime != null ">and d.OrganGetTime &lt;= #{endtime}</if>
         <if test="city != null and city != ''">and o.City = #{city}</if>

--
Gitblit v1.9.3