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

@@ -121,11 +121,12 @@

        //获取捐献进程进度
        Map<Integer, Long> terminationCase = total.stream().filter(Objects::nonNull).map(DonatebaseinfoProgressDTO::getTerminationCase).filter(Objects::nonNull).collect(Collectors.groupingBy(type -> type, Collectors.counting()));

        List<Map<String,Object>> totals= serviceDonatebaseinfoService.totalConfirmationBaseInfo(donatebaseinfoProgressVO);
        //数据封装
        Map<String, Object> map = new HashMap<>();
        map.put("terminationCase", terminationCase);
        map.put("donatebaseinfoProgressDTOS", donatebaseinfoProgressDTOS);
        map.put("total", totals);

        if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(map, totalCount);

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

@@ -8,10 +8,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@
    @Autowired
    private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;

    @Autowired
    private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
//    /**
//     * æŸ¥è¯¢ä¼¦ç†å®¡æŸ¥å‘起列表
//     */
@@ -85,7 +89,9 @@
    @ApiOperation("获取伦理审查发起详细信息")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceEthicalreviewinitiateService.getById(id));
        ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getById(id);

        return AjaxResult.success(serviceEthicalreviewinitiate);
    }

    /**
@@ -117,7 +123,11 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        return toAjax(serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate));
        boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate);
        if (result) {
            return AjaxResult.success();
        } else
            return AjaxResult.error();
    }

    /**

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,8 @@
      # ä¸»åº“数据源
      master:
        # å¼€å‘环境
        url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
#        url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023


 ruoyi-admin/target/classes/com/ruoyi/web/controller/common/ApiController.class

Binary files differ

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

@@ -1,6 +1,9 @@
package com.ruoyi.project.domain;

import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -124,6 +127,11 @@
    @Excel(name = "0：新建;1：审查中;2：结束")
    private String status;


    /**
     * é™„件多个;隔开
     */
    @ApiModelProperty("附件多个;隔开")
    @Excel(name = "附件多个;隔开")
    private String filePatch;
}


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

@@ -288,6 +288,18 @@
     * å®¶å±žæ„è§å¤‡æ³¨
     */
    @ApiModelProperty("家属意见备注")
    private String relativeconfirmationsignname;

    /**
     * äº²å±žå§“名
     */
    @ApiModelProperty("亲属姓名")
    private String relativeRemark;

    /**
     * äº²å±žè¯ä»¶å·
     */
    @ApiModelProperty("亲属证件号")
    private String relativeidcardno;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java

@@ -280,4 +280,16 @@
     */
    @ApiModelProperty("家属意见备注")
    private String relativeRemark;

    /**
     * å®¶å±žæ„è§å¤‡æ³¨
     */
    @ApiModelProperty("亲属姓名")
    private String relativeconfirmationsignname;

    /**
     * å®¶å±žæ„è§å¤‡æ³¨
     */
    @ApiModelProperty("亲属证件号")
    private String relativeidcardno;
}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java

@@ -161,5 +161,12 @@
    @Excel(name = "状态：0：新建;1：审查中;2：结束")
    private String status;

    /**
     * é™„件多个;隔开
     */
    @ApiModelProperty("附件多个;隔开")
    @Excel(name = "附件多个;隔开")
    private String filePatch;

}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java

@@ -5,10 +5,12 @@

import java.util.Date;
import java.util.List;
import java.util.Map;

import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -57,6 +59,8 @@

    List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO);

    List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO);

    ServiceDonatebaseinfo getById(Long infoid);

    int countByRecordState(@Param("recordState") String recordState, @Param("starttime") Date starttime, @Param("endtime") Date endtime);

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;
import java.util.Map;

import com.ruoyi.project.domain.ServiceRelativesconfirmation;
import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java

@@ -8,6 +8,7 @@
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
@@ -51,6 +52,8 @@

    List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO);

    List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO);

    String gethqzz(Long infoid);

    countByRecordStateVO countByRecordState(TimeVO timeVO);
@@ -58,4 +61,6 @@
    String getDonateNameById(Long infoid);

    Map<String, Object> getWorkFlow(Long id);


}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java

@@ -1,6 +1,8 @@
package com.ruoyi.project.service;

import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceRelativesconfirmation;
import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
@@ -30,4 +32,6 @@
    List<RelativeConfirmationVO> selectVOList(RelativeConfirmationVO relativeConfirmationVO);

    List<RelativeConfirmationBaseInfoDTO> confirmationBaseInfoList(RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO);


}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java

@@ -103,6 +103,7 @@
        // æ·»åŠ æ–°çš„记录
        for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
            if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) ) {
                serviceDonatebaseinfoReportFile.setId(null);
                serviceDonatebaseinfoReportFile.setUpdateBy(updateName);
                serviceDonatebaseinfoReportFile.setUpdateTime(new Date());
                serviceDonatebaseinfoReportFile.setCaseNo(caseNo);

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java

@@ -121,10 +121,14 @@
        //将report数据复制到serviceDonatebaseinfo中
        ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
        serviceDonatebaseinfo1.setId(null);
        serviceDonatebaseinfo1.setReportId(serviceDonatebaseinfoReport.getId());
        serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
        serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
        serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital());
        serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
        serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType());
        serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin());
        serviceDonatebaseinfo1.setRecordstate("0");
        //先通过caseNo查询是否存在
        ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java

@@ -254,6 +254,11 @@
    }

    @Override
    public List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO) {
        return serviceDonatebaseinfoMapper.totalConfirmationBaseInfo(donatebaseinfoProgressVO);
    }

    @Override
    public String gethqzz(Long infoid) {
        return serviceDonatebaseinfoMapper.gethqzz(infoid);
    }

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java

@@ -57,7 +57,7 @@
            for (ServiceTransport serviceTransport1 : list) {
                ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
                serviceTransportFile.setDelFlag(0);
                serviceTransportFile.setTransportId(serviceTransport1.getReportId());
                serviceTransportFile.setTransportId(serviceTransport1.getId());
                serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
                List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);


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

@@ -478,4 +478,34 @@
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>

    </select>
    <select id="totalConfirmationBaseInfo" resultType="Map">
        SELECT  recordstate AS recordState, count(recordstate) AS stateCount
        FROM service_donatebaseinfo sd
        LEFT JOIN service_medicalevaluation sm ON sd.ID = sm.InfoID
        AND sm.del_flag = 0 -- æçŒ®è¯„ä¼°
        LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID
        AND sr.del_flag = 0-- æçŒ®ç¡®è®¤
        LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID
        AND se.del_flag = 0-- ä¼¦ç†å®¡æŸ¥
        LEFT JOIN service_donationwitness sdw ON sd.ID = sdw.InfoID
        AND sdw.del_flag = 0-- èŽ·å–见证
        LEFT JOIN service_donatecompletioninfo sdt ON sd.ID = sdt.InfoID
        AND sdt.del_flag = 0 -- å®Œæˆç™»è®°

        <where>sd.del_flag = 0
            <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
            <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
            <if test="name != null ">AND sd.Name like concat('%', #{name}, '%')</if>
            <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
            <if test="startAge != null">AND sd.age &gt;= #{startAge}</if>
            <if test="endAge !=null">AND sd.age &lt;= #{endAge}
            </if>
            <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
            <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
            <if test="workflow != null">and sd.workflow = #{workflow}</if>
            <if test="diagnosisName != null">and sd.DiagnosisName like concat('%', #{diagnosisName}, '%')</if>
        </where>
        GROUP BY recordstate
    </select>

</mapper>

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

@@ -27,6 +27,7 @@
        <result property="expertTime" column="expert_time"/>
        <result property="expertType" column="expert_type"/>
        <result property="status" column="status"/>
        <result property="filePatch" column="file_patch"/>
    </resultMap>

    <sql id="selectServiceEthicalreviewinitiateVo">
@@ -101,7 +102,8 @@
        se.expert_name as expertName,
        se.expert_opinion as expertOpinion,
        se.expert_time as expertTime,
        se.status as status
        se.status as status,
        se.file_patch as filePatch
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0

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

@@ -52,6 +52,8 @@
        <result property="occupation" column="occupation"/>
        <result property="assessannex" column="assessannex"/>
        <result property="relativeRemark" column="relative_remark"/>
        <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/>
        <result property="relativeidcardno" column="relativeidcardno"/>
    </resultMap>

    <sql id="selectServiceRelativesconfirmationVo">
@@ -297,13 +299,15 @@
        sr.ResponsibleUserID as responsibleuserid,
        sr.CoordinatedUserIDO as coordinateduserido,
        sr.CoordinatedUserNameO as coordinatedusernameo,
        sr.CoordinatedUserNameT as coordinateduseridt,
        sr.CoordinatedUserNameT as coordinatedusernamet,
        sr.ResponsibleUserID as responsibleuserid,
        sr.nation as nation,
        sr.occupation as occupation,
        sr.relative_remark as relativeRemark,
        sr.assessannex as assessannex,
        sr.education as education
        sr.education as education,
        sr.relativeconfirmationsignname,
        sr.relativeidcardno
        FROM service_donatebaseinfo sd
        LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
        AND sr.del_flag = 0
@@ -337,4 +341,5 @@
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>


</mapper>

 ruoyi-project/target/classes/com/ruoyi/project/domain/dto/ApiDTO.class

Binary files differ

 ruoyi-project/target/classes/com/ruoyi/project/mapper/ApiMapper.class

Binary files differ

 ruoyi-project/target/classes/com/ruoyi/project/service/IApiService.class

Binary files differ

 ruoyi-project/target/classes/com/ruoyi/project/service/impl/ApiServiceImpl.class

Binary files differ

 ruoyi-project/target/classes/mapper/project/ApiMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ApiMapper">

</mapper>