代码提交

liusheng

2024-03-14 e81923546701f9aa0121cbebd3309ea228e122d4

代码提交

 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

 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>

 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>