代码提交

liusheng

2023-12-21 39690826c97e937d066b475059ee92d040c3155f

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -1041,6 +1041,7 @@

    private void getDataSS(Map dataMap, Long id) {
        ServiceFund serviceFund = serviceFundService.getById(id);
        log.info("通过id查询数据的结果：{}", serviceFund);
        if (serviceFund == null) {
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }
@@ -1141,6 +1142,7 @@

    private String getDataYX(Map dataMap, Long id) {
        ServiceFund serviceFund = serviceFundService.getById(id);
        log.info("通过id获取医学、办公、绩效成本的fund信息为：{}", serviceFund);
        if (serviceFund == null) {
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }
@@ -1166,7 +1168,8 @@
            throw new ServiceException("下载失败，没有对应信息", HttpStatus.NO_CONTENT);
        }

        Date dt = serviceFund.getCreateTime();
//        Date dt = serviceFund.getCreateTime();
        Date dt = serviceFund.getApplyTime();
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String date = formatter.format(dt);
        String time = date.substring(0, 10);

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java

@@ -21,318 +21,467 @@
 */
@Data
@ApiModel("捐献基础")
public class ServiceDonatebaseinfo extends BaseEntity
{
public class ServiceDonatebaseinfo extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** 姓名 */
    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    @Excel(name = "姓名")
    private String name;

    /** 性别 */
    /**
     * 性别
     */
    @ApiModelProperty("性别")
    private String sex;

    /** 证件类型 */
    /**
     * 证件类型
     */
    @ApiModelProperty("证件类型")
    private Long idcardtype;

    /** 证件号码 */
    /**
     * 证件号码
     */
    @ApiModelProperty("证件号码")
    private String idcardno;

    /** 年龄 */
    /**
     * 年龄
     */
    @ApiModelProperty("年龄")
    private Long age;

    /** 年龄单位 */
    /**
     * 年龄单位
     */
    @ApiModelProperty("年龄单位")
    private String ageunit;

    /** 出生日期 */
    /**
     * 出生日期
     */
    @ApiModelProperty("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date birthday;

    /** 联系电话 */
    /**
     * 联系电话
     */
    @ApiModelProperty("联系电话")
    private String phone;

    /** 现住地址 */
    /**
     * 现住地址
     */
    @ApiModelProperty("现住地址")
    private String residenceaddress;

    /** 国籍 */
    /**
     * 国籍
     */
    @ApiModelProperty("国籍")
    private String nationality;

    /** 省(区/市) */
    /**
     * 省(区/市)
     */
    @ApiModelProperty("省(区/市)")
    @Excel(name = "省(区/市)")
    private String residenceprovince;

    /** 籍贯 */
    /**
     * 籍贯
     */
    @ApiModelProperty("籍贯")
    @Excel(name = "籍贯")
    private String nativeplace;

    /** 现住地址省名称 */
    /**
     * 现住地址省名称
     */
    @ApiModelProperty("现住地址省名称")
    private String residenceprovincename;

    /** 民族 */
    /**
     * 民族
     */
    @ApiModelProperty("民族")
    private String nation;

    /** 职业 */
    /**
     * 职业
     */
    @ApiModelProperty("职业")
    private String occupation;

    /** 市(州) */
    /**
     * 市(州)
     */
    @ApiModelProperty("市(州)")
    private String residencecity;

    /** 市名称 */
    /**
     * 市名称
     */
    @ApiModelProperty("市名称")
    private String residencecityname;

    /** 学历 */
    /**
     * 学历
     */
    @ApiModelProperty("学历")
    private String education;

    /** 县（市/区） */
    /**
     * 县（市/区）
     */
    @ApiModelProperty("县（市/区）")
    private String residencetown;

    /** 所属街道（镇）名称 */
    /**
     * 所属街道（镇）名称
     */
    @ApiModelProperty("所属街道（镇）名称")
    private String residencetownname;

    /** 社区（村）编号 根据行政区划表 */
    /**
     * 社区（村）编号 根据行政区划表
     */
    @ApiModelProperty("社区（村）编号 根据行政区划表")
    private String residencecommunity;

    /** 社区（村）名称 */
    /**
     * 社区（村）名称
     */
    @ApiModelProperty("社区（村）名称")
    private String residencecommunityname;

    /** 所属区域编号  根据行政区划表 */
    /**
     * 所属区域编号  根据行政区划表
     */
    @ApiModelProperty("所属区域编号  根据行政区划表")
    private String residencecountycode;

    /** 所属区域名称 */
    /**
     * 所属区域名称
     */
    @ApiModelProperty("所属区域名称")
    private String residencecountyname;

    /** 户籍地址 */
    /**
     * 户籍地址
     */
    @ApiModelProperty("户籍地址")
    private String registeraddress;

    /** 省(区/市) */
    /**
     * 省(区/市)
     */
    @ApiModelProperty("省(区/市)")
    private String registerprovince;

    /** 户籍地址省名称 */
    /**
     * 户籍地址省名称
     */
    @ApiModelProperty("户籍地址省名称")
    private String registerprovincename;

    /** 市(州) */
    /**
     * 市(州)
     */
    @ApiModelProperty("市(州)")
    private String registercity;

    /** 市名称 */
    /**
     * 市名称
     */
    @ApiModelProperty("市名称")
    private String registercityname;

    /** 县（市/区） */
    /**
     * 县（市/区）
     */
    @ApiModelProperty("县（市/区）")
    private String registertown;

    /** 所属街道（镇）名称 */
    /**
     * 所属街道（镇）名称
     */
    @ApiModelProperty("所属街道（镇）名称")
    private String registertownname;

    /** 社区（村）编号 根据行政区划表 */
    /**
     * 社区（村）编号 根据行政区划表
     */
    @ApiModelProperty("社区（村）编号 根据行政区划表")
    private String registercommunity;

    /** 社区（村）名称 */
    /**
     * 社区（村）名称
     */
    @ApiModelProperty("社区（村）名称")
    private String registercommunityname;

    /** 所属区域编号  根据行政区划表 */
    /**
     * 所属区域编号  根据行政区划表
     */
    @ApiModelProperty("所属区域编号  根据行政区划表")
    private String registercountycode;

    /** 所属区域名称 */
    /**
     * 所属区域名称
     */
    @ApiModelProperty("所属区域名称")
    private String registercountyname;

    /** 记录状态 */
    /**
     * 记录状态
     */
    @ApiModelProperty("记录状态")
    @Excel(name = "记录状态")
    private String recordstate;

    /** 治疗医院 */
    /**
     * 治疗医院
     */
    @ApiModelProperty("治疗医院")
    private String treatmenthospitalno;

    /** 所在医疗机构 */
    /**
     * 所在医疗机构
     */
    @ApiModelProperty("所在医疗机构")
    @Excel(name = "所在医疗机构")
    private String treatmenthospitalname;

    /** 科室 */
    /**
     * 科室
     */
    @ApiModelProperty("科室")
    private String treatmentdeptname;

    /** 疾病诊断 */
    /**
     * 疾病诊断
     */
    @ApiModelProperty("疾病诊断")
    private String diagnosisno;

    /** 疾病诊断名称 */
    /**
     * 疾病诊断名称
     */
    @ApiModelProperty("疾病诊断名称")
    private String diagnosisname;

    /** 血型  */
    /**
     * 血型
     */
    @ApiModelProperty("血型 ")
    private String bloodtype;

    /** 住院号 */
    /**
     * 住院号
     */
    @ApiModelProperty("住院号")
    private String inpatientno;

    /** Rh阴性 */
    /**
     * Rh阴性
     */
    @ApiModelProperty("Rh阴性")
    private String rhyin;

    /** 捐献者编号 */
    /**
     * 捐献者编号
     */
    @ApiModelProperty("捐献者编号")
    private String donorno;

    /** 捐献类别 */
    /**
     * 捐献类别
     */
    @ApiModelProperty("捐献类别")
    private String donationcategory;

    /** 病情概况 */
    /**
     * 病情概况
     */
    @ApiModelProperty("病情概况")
    private String illnessoverview;

    /** 疾病类型 */
    /**
     * 疾病类型
     */
    @ApiModelProperty("疾病类型")
    private String diseasetype;

    /** 传染病情况 */
    /**
     * 传染病情况
     */
    @ApiModelProperty("传染病情况")
    private String infectious;

    /** 本人意愿  */
    /**
     * 本人意愿
     */
    @ApiModelProperty("本人意愿 ")
    private String selfwill;

    /** 其他情况 */
    /**
     * 其他情况
     */
    @ApiModelProperty("其他情况")
    private String othercases;

    /** 亲属意愿 */
    /**
     * 亲属意愿
     */
    @ApiModelProperty("亲属意愿")
    private Long kinshipwill;

    /** 其他 */
    /**
     * 其他
     */
    @ApiModelProperty("其他")
    private String diseasetypeOther;

    /** 亲属关系状况 */
    /**
     * 亲属关系状况
     */
    @ApiModelProperty("亲属关系状况")
    private String kinship;

    /** 信息来源 */
    /**
     * 信息来源
     */
    @ApiModelProperty("信息来源")
    private String infosources;

    /** 红十字会机构编号 选自机构表 */
    /**
     * 红十字会机构编号 选自机构表
     */
    @ApiModelProperty("红十字会机构编号 选自机构表")
    private String redorganno;

    /** 红十字会机构名称 */
    /**
     * 红十字会机构名称
     */
    @ApiModelProperty("红十字会机构名称")
    private String redorganname;

    /** 红十字会联系人 */
    /**
     * 红十字会联系人
     */
    @ApiModelProperty("红十字会联系人")
    private String contactperson;

    /** 其他 */
    /**
     * 其他
     */
    @ApiModelProperty("其他")
    private String infectiousOther;

    /** 红十字会联系电话 */
    /**
     * 红十字会联系电话
     */
    @ApiModelProperty("红十字会联系电话")
    private String contactnumber;

    /** 报告者编号 */
    /**
     * 报告者编号
     */
    @ApiModelProperty("报告者编号")
    private String reporterno;

    /** 报告者姓名 */
    /**
     * 报告者姓名
     */
    @ApiModelProperty("报告者姓名")
    @Excel(name = "报告者姓名")
    private String reportername;

    /** 病人状况 */
    /**
     * 病人状况
     */
    @ApiModelProperty("病人状况")
    private String patientstate;

    /** 报告者联系电话 */
    /**
     * 报告者联系电话
     */
    @ApiModelProperty("报告者联系电话")
    private String reporterphone;

    /** 信息来源其他 */
    /**
     * 信息来源其他
     */
    @ApiModelProperty("信息来源其他")
    private String infosourcesOther;

    /** 报告时间 */
    /**
     * 报告时间
     */
    @ApiModelProperty("报告时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date reporttime;

    /** 其他 */
    /**
     * 其他
     */
    @ApiModelProperty("其他")
    private String kinshipOther;

    /** 主要亲属 */
    /**
     * 主要亲属
     */
    @ApiModelProperty("主要亲属")
    private String majorrelatives;

    /** 与捐赠者关系 */
    /**
     * 与捐赠者关系
     */
    @ApiModelProperty("与捐赠者关系")
    private String familyrelations;

    /** 获取组织编号 */
    /**
     * 获取组织编号
     */
    @ApiModelProperty("获取组织编号")
    private String acquisitiontissueno;

    /** 获取组织名称 */
    /**
     * 获取组织名称
     */
    @ApiModelProperty("获取组织名称")
    private String acquisitiontissuename;

    /** 信息员姓名 */
    /**
     * 信息员姓名
     */
    @ApiModelProperty("信息员姓名")
    private String infoname;

    /** 信息员联系方式 */
    /**
     * 信息员联系方式
     */
    @ApiModelProperty("信息员联系方式")
    private String infophone;

    /** 联系时间 */
    /**
     * 联系时间
     */
    @ApiModelProperty("联系时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date contacttime;
@@ -386,5 +535,13 @@
    @Excel(name = "终止案例")
    private Integer terminationCase;

    @ApiModelProperty("案例时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date donatetime;

    @ApiModelProperty("案例序号")
    private String donateno;


}

 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml

@@ -39,7 +39,6 @@
        <result property="recordstate"    column="RecordState"    />
        <result property="treatmenthospitalno"    column="TreatmentHospitalNo"    />
        <result property="treatmenthospitalname"    column="TreatmentHospitalName"    />
<!--        <result property="treatmentdeptno"    column="TreatmentDeptNo"    />-->
        <result property="treatmentdeptname"    column="TreatmentDeptName"    />
        <result property="diagnosisno"    column="DiagnosisNo"    />
        <result property="diagnosisname"    column="DiagnosisName"    />
@@ -48,11 +47,6 @@
        <result property="donorno"    column="DonorNo"    />
        <result property="donationcategory"    column="DonationCategory"    />
        <result property="illnessoverview"    column="IllnessOverview"    />
<!--        <result property="malignanttumor"    column="MalignantTumor"    />-->
<!--        <result property="deepcoma"    column="DeepComa"    />-->
<!--        <result property="spontaneousbreathing"    column="SpontaneousBreathing"    />-->
<!--        <result property="istrafficaccident"    column="IsTrafficAccident"    />-->
<!--        <result property="iscriminalcase"    column="IsCriminalCase"    />-->
        <result property="kinship"    column="Kinship"    />
        <result property="selfwill"    column="SelfWill"    />
        <result property="kinshipwill"    column="KinshipWill"    />
@@ -76,14 +70,6 @@
        <result property="occupation"    column="Occupation"    />
        <result property="education"    column="Education"    />
        <result property="nativeplace"    column="NativePlace"    />
<!--        <result property="annexillnessprofile"    column="AnnexIllnessProfile"    />-->
<!--        <result property="annexdiseaseassessment"    column="AnnexDiseaseAssessment"    />-->
<!--        <result property="annexevaluationopinion"    column="AnnexEvaluationOpinion"    />-->
<!--        <result property="annexbraindeathjudgment"    column="AnnexBrainDeathJudgment"    />-->
<!--        <result property="annexeegreport"    column="AnnexEEGReport"    />-->
<!--        <result property="annexshortlatencyreport"    column="AnnexShortLatencyReport"    />-->
<!--        <result property="annexdopplerreportus"    column="AnnexDopplerReportUS"    />-->
<!--        <result property="annexdeathriskassessment"    column="AnnexDeathRiskAssessment"    />-->
        <result property="infoname"    column="infoName"    />
        <result property="infophone"    column="infoPhone"    />
        <result property="deptid"    column="deptid"    />
@@ -93,11 +79,15 @@
        <result property="businessarea"    column="businessarea"    />
        <result property="annexfiles"    column="annexfiles"    />
        <result property="workflow"    column="workflow"    />

        <result property="donatetime" column="donatetime"/>
        <result property="donateno" column="donateno"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoVo">
   select service_donatebaseinfo.* from service_donatebaseinfo         LEFT JOIN `base_organization` ON `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
        select service_donatebaseinfo.*
        from service_donatebaseinfo
                 LEFT JOIN `base_organization`
                           ON `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
    </sql>
    <update id="updateDonateNumber">
        update service_donatebaseinfo
@@ -105,7 +95,8 @@
        where ID = #{id}
    </update>

    <select id="selectServiceDonatebaseinfoList" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo" resultMap="ServiceDonatebaseinfoResult">
    <select id="selectServiceDonatebaseinfoList" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo"
            resultMap="ServiceDonatebaseinfoResult">
        <include refid="selectServiceDonatebaseinfoVo"/>
        <where>
            service_donatebaseinfo.del_flag = 0
@@ -117,66 +108,98 @@
            <if test="ageunit != null  and ageunit != ''"> and AgeUnit = #{ageunit}</if>
            <if test="birthday != null  and birthday != ''"> and Birthday = #{birthday}</if>
            <if test="phone != null  and phone != ''"> and Phone = #{phone}</if>
            <if test="residenceaddress != null  and residenceaddress != ''"> and ResidenceAddress = #{residenceaddress}</if>
            <if test="residenceprovince != null  and residenceprovince != ''"> and ResidenceProvince = #{residenceprovince}</if>
            <if test="residenceprovincename != null  and residenceprovincename != ''"> and ResidenceProvinceName like concat('%', #{residenceprovincename}, '%')</if>
            <if test="residenceaddress != null  and residenceaddress != ''">and ResidenceAddress = #{residenceaddress}
            </if>
            <if test="residenceprovince != null  and residenceprovince != ''">and ResidenceProvince =
                #{residenceprovince}
            </if>
            <if test="residenceprovincename != null  and residenceprovincename != ''">and ResidenceProvinceName like
                concat('%', #{residenceprovincename}, '%')
            </if>
            <if test="residencecity != null  and residencecity != ''"> and ResidenceCity = #{residencecity}</if>
            <if test="residencecityname != null  and residencecityname != ''"> and ResidenceCityName like concat('%', #{residencecityname}, '%')</if>
            <if test="residencecityname != null  and residencecityname != ''">and ResidenceCityName like concat('%',
                #{residencecityname}, '%')
            </if>
            <if test="residencetown != null  and residencetown != ''"> and ResidenceTown = #{residencetown}</if>
            <if test="residencetownname != null  and residencetownname != ''"> and ResidenceTownName like concat('%', #{residencetownname}, '%')</if>
            <if test="residencecommunity != null  and residencecommunity != ''"> and ResidenceCommunity = #{residencecommunity}</if>
            <if test="residencecommunityname != null  and residencecommunityname != ''"> and ResidenceCommunityName like concat('%', #{residencecommunityname}, '%')</if>
            <if test="residencecountycode != null  and residencecountycode != ''"> and ResidenceCountyCode = #{residencecountycode}</if>
            <if test="residencecountyname != null  and residencecountyname != ''"> and ResidenceCountyName like concat('%', #{residencecountyname}, '%')</if>
            <if test="residencetownname != null  and residencetownname != ''">and ResidenceTownName like concat('%',
                #{residencetownname}, '%')
            </if>
            <if test="residencecommunity != null  and residencecommunity != ''">and ResidenceCommunity =
                #{residencecommunity}
            </if>
            <if test="residencecommunityname != null  and residencecommunityname != ''">and ResidenceCommunityName like
                concat('%', #{residencecommunityname}, '%')
            </if>
            <if test="residencecountycode != null  and residencecountycode != ''">and ResidenceCountyCode =
                #{residencecountycode}
            </if>
            <if test="residencecountyname != null  and residencecountyname != ''">and ResidenceCountyName like
                concat('%', #{residencecountyname}, '%')
            </if>
            <if test="registeraddress != null  and registeraddress != ''"> and RegisterAddress = #{registeraddress}</if>
            <if test="registerprovince != null  and registerprovince != ''"> and RegisterProvince = #{registerprovince}</if>
            <if test="registerprovincename != null  and registerprovincename != ''"> and RegisterProvinceName like concat('%', #{registerprovincename}, '%')</if>
            <if test="registerprovince != null  and registerprovince != ''">and RegisterProvince = #{registerprovince}
            </if>
            <if test="registerprovincename != null  and registerprovincename != ''">and RegisterProvinceName like
                concat('%', #{registerprovincename}, '%')
            </if>
            <if test="registercity != null  and registercity != ''"> and RegisterCity = #{registercity}</if>
            <if test="registercityname != null  and registercityname != ''"> and RegisterCityName like concat('%', #{registercityname}, '%')</if>
            <if test="registercityname != null  and registercityname != ''">and RegisterCityName like concat('%',
                #{registercityname}, '%')
            </if>
            <if test="registertown != null  and registertown != ''"> and RegisterTown = #{registertown}</if>
            <if test="registertownname != null  and registertownname != ''"> and RegisterTownName like concat('%', #{registertownname}, '%')</if>
            <if test="registercommunity != null  and registercommunity != ''"> and RegisterCommunity = #{registercommunity}</if>
            <if test="registercommunityname != null  and registercommunityname != ''"> and RegisterCommunityName like concat('%', #{registercommunityname}, '%')</if>
            <if test="registercountycode != null  and registercountycode != ''"> and RegisterCountyCode = #{registercountycode}</if>
            <if test="registercountyname != null  and registercountyname != ''"> and RegisterCountyName like concat('%', #{registercountyname}, '%')</if>
            <if test="registertownname != null  and registertownname != ''">and RegisterTownName like concat('%',
                #{registertownname}, '%')
            </if>
            <if test="registercommunity != null  and registercommunity != ''">and RegisterCommunity =
                #{registercommunity}
            </if>
            <if test="registercommunityname != null  and registercommunityname != ''">and RegisterCommunityName like
                concat('%', #{registercommunityname}, '%')
            </if>
            <if test="registercountycode != null  and registercountycode != ''">and RegisterCountyCode =
                #{registercountycode}
            </if>
            <if test="registercountyname != null  and registercountyname != ''">and RegisterCountyName like concat('%',
                #{registercountyname}, '%')
            </if>
            <if test="recordstate != null and recordstate != ''"> and RecordState = #{recordstate}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''"> and TreatmentHospitalNo = #{treatmenthospitalno}</if>
            <if test="treatmenthospitalname != null  and treatmenthospitalname != ''"> and TreatmentHospitalName like concat('%', #{treatmenthospitalname}, '%')</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and TreatmentHospitalNo =
                #{treatmenthospitalno}
            </if>
            <if test="treatmenthospitalname != null  and treatmenthospitalname != ''">and TreatmentHospitalName like
                concat('%', #{treatmenthospitalname}, '%')
            </if>
<!--            <if test="treatmentdeptno != null  and treatmentdeptno != ''"> and TreatmentDeptNo = #{treatmentdeptno}</if>-->
            <if test="treatmentdeptname != null  and treatmentdeptname != ''"> and TreatmentDeptName like concat('%', #{treatmentdeptname}, '%')</if>
            <if test="treatmentdeptname != null  and treatmentdeptname != ''">and TreatmentDeptName like concat('%',
                #{treatmentdeptname}, '%')
            </if>
            <if test="diagnosisno != null  and diagnosisno != ''"> and DiagnosisNo = #{diagnosisno}</if>
            <if test="diagnosisname != null  and diagnosisname != ''"> and DiagnosisName like concat('%', #{diagnosisname}, '%')</if>
            <if test="diagnosisname != null  and diagnosisname != ''">and DiagnosisName like concat('%',
                #{diagnosisname}, '%')
            </if>
            <if test="bloodtype != null  and bloodtype != ''"> and BloodType = #{bloodtype}</if>
            <if test="inpatientno != null  and inpatientno != ''"> and InpatientNo = #{inpatientno}</if>
            <if test="donorno != null  and donorno != ''"> and DonorNo like concat('%', #{donorno}, '%')</if>
            <if test="donationcategory != null  and donationcategory != ''"> and DonationCategory = #{donationcategory}</if>
            <if test="donationcategory != null  and donationcategory != ''">and DonationCategory = #{donationcategory}
            </if>
            <if test="illnessoverview != null  and illnessoverview != ''"> and IllnessOverview = #{illnessoverview}</if>
<!--            <if test="malignanttumor != null "> and MalignantTumor = #{malignanttumor}</if>-->
<!--            <if test="deepcoma != null "> and DeepComa = #{deepcoma}</if>-->
<!--            <if test="spontaneousbreathing != null "> and SpontaneousBreathing = #{spontaneousbreathing}</if>-->
<!--            <if test="istrafficaccident != null "> and IsTrafficAccident = #{istrafficaccident}</if>-->
<!--            <if test="iscriminalcase != null "> and IsCriminalCase = #{iscriminalcase}</if>-->
            <if test="kinship != null  and kinship != ''"> and Kinship = #{kinship}</if>
            <if test="selfwill != null "> and SelfWill = #{selfwill}</if>
            <if test="kinshipwill != null "> and KinshipWill = #{kinshipwill}</if>
            <if test="infosources != null  and infosources != ''"> and InfoSources = #{infosources}</if>
            <if test="redorganno != null  and redorganno != ''"> and RedOrganNo = #{redorganno}</if>
            <if test="redorganname != null  and redorganname != ''"> and RedOrganName like concat('%', #{redorganname}, '%')</if>
            <if test="redorganname != null  and redorganname != ''">and RedOrganName like concat('%', #{redorganname},
                '%')
            </if>
            <if test="contactperson != null  and contactperson != ''"> and ContactPerson = #{contactperson}</if>
            <if test="contactnumber != null  and contactnumber != ''"> and ContactNumber = #{contactnumber}</if>
            <if test="contacttime != null  and contacttime != ''"> and ContactTime = #{contacttime}</if>
            <if test="reporterno != null  and reporterno != ''"> and ReporterNo = #{reporterno}</if>
            <if test="reportername != null  and reportername != ''"> and ReporterName like concat('%', #{reportername}, '%')</if>
            <if test="reportername != null  and reportername != ''">and ReporterName like concat('%', #{reportername},
                '%')
            </if>
            <if test="reporterphone != null  and reporterphone != ''"> and ReporterPhone = #{reporterphone}</if>
            <if test="reporttime != null "> and ReportTime = #{reporttime}</if>
<!--            <if test="annexillnessprofile != null  and annexillnessprofile != ''"> and AnnexIllnessProfile = #{annexillnessprofile}</if>-->
<!--            <if test="annexdiseaseassessment != null  and annexdiseaseassessment != ''"> and AnnexDiseaseAssessment = #{annexdiseaseassessment}</if>-->
<!--            <if test="annexevaluationopinion != null  and annexevaluationopinion != ''"> and AnnexEvaluationOpinion = #{annexevaluationopinion}</if>-->
<!--            <if test="annexbraindeathjudgment != null  and annexbraindeathjudgment != ''"> and AnnexBrainDeathJudgment = #{annexbraindeathjudgment}</if>-->
<!--            <if test="annexeegreport != null  and annexeegreport != ''"> and AnnexEEGReport = #{annexeegreport}</if>-->
<!--            <if test="annexshortlatencyreport != null  and annexshortlatencyreport != ''"> and AnnexShortLatencyReport = #{annexshortlatencyreport}</if>-->
<!--            <if test="annexdopplerreportus != null  and annexdopplerreportus != ''"> and AnnexDopplerReportUS = #{annexdopplerreportus}</if>-->
<!--            <if test="annexdeathriskassessment != null  and annexdeathriskassessment != ''"> and AnnexDeathRiskAssessment = #{annexdeathriskassessment}</if>-->
            <if test="infoname != null "> and infoName = #{infoname}</if>
            <if test="infophone != null "> and infoPhone = #{infophone}</if>
            <if test="createBy != null "> and `service_donatebaseinfo`.create_by = #{createBy}</if>
@@ -189,6 +212,8 @@
            <if test="leaderno != null "> and leaderno = #{leaderno}</if>
            <if test="leadername != null "> and leadername = #{leadername}</if>
            <if test="businessarea != null "> and businessarea = #{businessarea}</if>
            <if test="donatetime != null ">and donatetime = #{donatetime}</if>
            <if test="donateno != null ">and donateno = #{donateno}</if>
        </where>

        order by ReportTime desc
@@ -196,12 +221,14 @@
    </select>

    <select id="getDonateNumberById" resultType="java.lang.String">
        select DonorNo from service_donatebaseinfo
        select DonorNo
        from service_donatebaseinfo
        where id = #{id}
    </select>

    <select id="getDonateCount" resultType="java.lang.Integer">
        select count(*) from service_donatebaseinfo
        select count(*)
        from service_donatebaseinfo
        where RecordState = "9"

    </select>
@@ -217,23 +244,29 @@
        </where>
    </select>
    <select id="countNumber" resultType="java.lang.Integer">
        select count(*) from service_donatebaseinfo
        where ReportTime >= #{starttime} and ReportTime &lt;= #{endtime}
        select count(*)
        from service_donatebaseinfo
        where ReportTime >= #{starttime}
          and ReportTime &lt;= #{endtime}
    </select>
    <select id="getBloodCode" resultType="java.lang.String">
        select BloodCode from base_bloodtype
        select BloodCode
        from base_bloodtype
        where BloodType = #{bloodtype}
    </select>
    <select id="countTerminatedNumber" resultType="java.lang.Integer">
        select count(*) from service_donatebaseinfo
        select count(*)
        from service_donatebaseinfo
        where RecordState = "99"
        and ReportTime >= #{starttime} and ReportTime &lt;= #{endtime}
          and ReportTime >= #{starttime}
          and ReportTime &lt;= #{endtime}
    </select>
    <select id="getAllDonateBaseInfo" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
        <include refid="selectServiceDonatebaseinfoVo"/>
    </select>
    <select id="getBaseInfoByHospital" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
        select ID, ReportTime from service_donatebaseinfo
        select ID, ReportTime
        from service_donatebaseinfo
        where TreatmentHospitalNo = #{organizationid}
    </select>
    <select id="getAllDonateBaseInfoByTime" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
@@ -257,60 +290,75 @@
           or residencetownname like concat('%', #{name}, '%')
             or bloodtype like concat('%', #{name}, '%')
            or nativeplace like concat('%', #{name}, '%')
            or reportername like concat('%', #{name}, '%')</if>
                or reportername like concat('%', #{name}, '%')
            </if>

        </where>
    </select>
    <select id="getDonorNameById" resultType="java.lang.String">
        select name from service_donatebaseinfo
        select name
        from service_donatebaseinfo
        where id = #{infoid}
    </select>
    <select id="gethqzz" resultType="java.lang.String">
        select AcquisitionTissueName from service_donatebaseinfo
        select AcquisitionTissueName
        from service_donatebaseinfo
        where id = #{infoid}
    </select>
    <select id="getById" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
        select * from service_donatebaseinfo
        select *
        from service_donatebaseinfo
        where id = #{infoid}
    </select>
    <select id="countByRecordState" resultType="java.lang.Integer">
        select count(*) from service_donatebaseinfo
        select count(*)
        from service_donatebaseinfo
        where RecordState = #{recordState}
        and ReportTime >= #{starttime} and ReportTime &lt;= #{endtime}
          and ReportTime >= #{starttime}
          and ReportTime &lt;= #{endtime}
    </select>
    <select id="getDistrictDonate" resultType="java.lang.String">
        select o.city from service_donatebaseinfo b
        select o.city
        from service_donatebaseinfo b
        inner join base_organization o on o.organizationid=b.treatmenthospitalno
        where (b.RecordState = '0' or b.RecordState = '1' or b.RecordState = '2')
    </select>
    <select id="getDistrictComplete" resultType="java.lang.String">
        select o.city from service_donatebaseinfo b
        select o.city
        from service_donatebaseinfo b
        inner join service_donatecompletioninfo d on d.infoid=b.id
        inner join base_organization o on o.organizationid=b.treatmenthospitalno
        where d.CompleteTime > 0
    </select>
    <select id="getDistrictOrgans" resultType="java.lang.String">
        select o.city from service_donatebaseinfo b
        select o.city
        from service_donatebaseinfo b
        inner join service_donateorgan d on d.infoid=b.id
        inner join base_organization o on o.organizationid=b.treatmenthospitalno
        where d.OrganGetTime > 0
    </select>
    <select id="getDonateNameById" resultType="java.lang.String">
        select Name from service_donatebaseinfo
        select Name
        from service_donatebaseinfo
        where id = #{infoid}
    </select>

    <select id="getDistrictDonateByTime" resultType="java.lang.String">
        select o.city from service_donatebaseinfo b
        select o.city
        from service_donatebaseinfo b
                               inner join base_organization o on o.organizationid=b.treatmenthospitalno
        where (b.RecordState = '0' or b.RecordState = '1' or b.RecordState = '2')
            and b.ReportTime >= #{starttime} and b.ReportTime &lt;= #{endtime}
          and b.ReportTime >= #{starttime}
          and b.ReportTime &lt;= #{endtime}
    </select>
    <select id="getDistrictCompleteByTime" resultType="java.lang.String">
        select o.city from service_donatebaseinfo b
        select o.city
        from service_donatebaseinfo b
                               inner join service_donatecompletioninfo d on d.infoid=b.id
                               inner join base_organization o on o.organizationid=b.treatmenthospitalno
        where d.del_flag=0  and d.CompleteTime >= #{starttime} and d.CompleteTime &lt;= #{endtime}
        where d.del_flag = 0
          and d.CompleteTime >= #{starttime}
          and d.CompleteTime &lt;= #{endtime}
    </select>

    <select id="gettreatmenthospitalnoCompleteByTime" resultType="java.lang.String">
@@ -327,10 +375,14 @@
    </select>

    <select id="getDistrictOrgansByTime" resultType="java.lang.String">
        select o.city from service_donatebaseinfo b
        select o.city
        from service_donatebaseinfo b
                               inner join service_donateorgan d on d.infoid=b.id
                               inner join base_organization o on o.organizationid=b.treatmenthospitalno
        WHERE d.del_flag=0  AND d.OrganGetTime IS NOT NULL AND d.OrganGetTime >= #{starttime} AND d.OrganGetTime &lt;= #{endtime}
        WHERE d.del_flag = 0
          AND d.OrganGetTime IS NOT NULL
          AND d.OrganGetTime >= #{starttime}
          AND d.OrganGetTime &lt;= #{endtime}
    </select>

</mapper>