伦理审查专家新增获取伦理审查专家接收、获取伦理审查专家数量、专家统计详情
已修改13个文件
已添加1个文件
202 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalreviewopinionsTotalVO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -160,7 +160,7 @@
        boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
        if (b) {
            serviceDonatebaseinfoReportFileService.updateList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getId(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
            if (serviceDonatebaseinfoReport.getReportStatus().equals("3")) {
            if (serviceDonatebaseinfoReport.getReportStatus().equals("3")&&serviceDonatebaseinfoReport.getIsDonate().equals(1)) {
                //如果同意上报,那就可以建档了(往 ServiceDonatebaseinfo新增)
                serviceDonatebaseinfoReportService.createDocument(serviceDonatebaseinfoReport);
            }
@@ -180,4 +180,20 @@
        serviceDonatebaseinfoReport.setDelFlag(1);
        return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport));
    }
    /**
     * ä¿®æ”¹æçŒ®ä¸ŠæŠ¥åŸºç¡€
     */
    @ApiOperation("上报")
    @Log(title = "上报", businessType = BusinessType.UPDATE)
    @PostMapping("/report")
    @RepeatSubmit
    public AjaxResult report(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        if (StringUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) {
            throw new BaseException("案例编号为空,请检查后再修改");
        }
        boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
        return toAjax(b);
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -1,5 +1,7 @@
package com.ruoyi.web.controller.project;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
@@ -14,6 +16,9 @@
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -103,4 +108,39 @@
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceEthicalreviewopinionsService.removeByIds(Arrays.asList(ids)));
    }
    /**
     * èŽ·å–ä¼¦ç†å®¡æŸ¥ä¸“å®¶æ•°é‡
     */
    @ApiOperation("获取伦理审查专家数量")
    @GetMapping(value = "/expertCount")
    public AjaxResult count(Integer InfoID) {
        QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
        ethicalreviewopinionsWrapper.eq("InfoID",InfoID);
        long count =serviceEthicalreviewopinionsService.count(ethicalreviewopinionsWrapper);
        return AjaxResult.success(count);
    }
    /**
     * èŽ·å–ä¼¦ç†å®¡æŸ¥ä¸“å®¶æŽ¥æ”¶
     */
    @ApiOperation("获取伦理审查专家接收")
    @GetMapping("/receiveStatus")
    public AjaxResult receiveStatus(Integer InfoID,String DonorNo) {
        QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
        ethicalreviewopinionsWrapper.eq("InfoID",InfoID).eq("DonorNo",DonorNo);
        ServiceEthicalreviewopinions serviceEthicalreviewopinions =new ServiceEthicalreviewopinions();
        serviceEthicalreviewopinions.setReceiveStatus("1");
        return toAjax(serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper));
    }
    /**
     * èŽ·å–ä¼¦ç†å®¡æŸ¥ä¸“å®¶æ•°é‡
     */
    @ApiOperation("专家统计详情")
    @GetMapping(value = "/expertTotal")
    public AjaxResult expertTotal(String DonorNo) {
        return AjaxResult.success(serviceEthicalreviewopinionsService.expertTotal(DonorNo));
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
@@ -115,5 +115,31 @@
    @ApiModelProperty("状态1待利用,2进行中,3捐献完成,4放弃")
    @Excel(name = "状态1待利用,2进行中,3捐献完成,4放弃")
    private String state;
    /** æ­»äº¡æ—¶é—´ */
    @ApiModelProperty("心死亡时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "心死亡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date heartdeathtime;
    /** æ­»äº¡åŽŸå›  */
    @ApiModelProperty("心死亡原因")
    @Excel(name = "心死亡原因")
    private String heartdeathreason;
    /** æ­»äº¡åˆ¤å®šåŒ»ç”Ÿä¸€ */
    @ApiModelProperty("心死亡判定医生一")
    @Excel(name = "心死亡判定医生一")
    private String heartdeathjudgedocto;
    /** æ­»äº¡åˆ¤å®šåŒ»ç”ŸäºŒ */
    @ApiModelProperty("心死亡判定医生二")
    @Excel(name = "心死亡判定医生二")
    private String heartdeathjudgedoctt;
    /** æ­»äº¡è¯æ˜Žé™„ä»¶ */
    @ApiModelProperty("心死亡证明附件")
    @Excel(name = "心死亡证明附件")
    private String heartdeathjudgeannex;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -431,5 +431,16 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date  entryTime;
    @ApiModelProperty("驳回类型")
    @Excel(name = "驳回类型")
    private String rejectType;
    /**
     * æ˜¯å¦ä¸ŠæŠ¥0不上报1上报
     */
    @TableField(exist = false)
    @ApiModelProperty("是否捐献0不捐献1捐献")
    private Integer isDonate;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
@@ -133,5 +133,9 @@
    @ApiModelProperty("附件多个;隔开")
    @Excel(name = "附件多个;隔开")
    private String filePatch;
    @ApiModelProperty("签名")
    @Excel(name = "签名")
    private String sigin;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
@@ -211,5 +211,31 @@
    @Excel(name = "状态1待利用,2进行中,3捐献完成,4放弃")
    private String state;
    /** æ­»äº¡æ—¶é—´ */
    @ApiModelProperty("心死亡时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "心死亡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date heartdeathtime;
    /** æ­»äº¡åŽŸå›  */
    @ApiModelProperty("心死亡原因")
    @Excel(name = "心死亡原因")
    private String heartdeathreason;
    /** æ­»äº¡åˆ¤å®šåŒ»ç”Ÿä¸€ */
    @ApiModelProperty("心死亡判定医生一")
    @Excel(name = "心死亡判定医生一")
    private String heartdeathjudgedocto;
    /** æ­»äº¡åˆ¤å®šåŒ»ç”ŸäºŒ */
    @ApiModelProperty("心死亡判定医生二")
    @Excel(name = "心死亡判定医生二")
    private String heartdeathjudgedoctt;
    /** æ­»äº¡è¯æ˜Žé™„ä»¶ */
    @ApiModelProperty("心死亡证明附件")
    @Excel(name = "心死亡证明附件")
    private String heartdeathjudgeannex;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
@@ -168,5 +168,8 @@
    @Excel(name = "附件多个;隔开")
    private String filePatch;
    @ApiModelProperty("签名")
    @Excel(name = "签名")
    private String sigin;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalreviewopinionsTotalVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.ruoyi.project.domain.vo;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class EthicalreviewopinionsTotalVO {
    @ApiModelProperty("总数量")
    private String count;
    @ApiModelProperty("已接收数量")
    private String acceptCount;
    @ApiModelProperty("未接收数量")
    private String notAcceptCount;
    @ApiModelProperty("有专意见数量")
    private String opinionCount;
    @ApiModelProperty("没专意见数量")
    private String notApinionCount;
    @ApiModelProperty("有专意附件量")
    private String annexCount;
    @ApiModelProperty("没专意附件量")
    private String notAnnexCount;
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java
@@ -5,6 +5,7 @@
import java.util.List;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
@@ -28,4 +29,6 @@
    List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO);
    Integer countNumber(TimeVO timeVO);
    List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
/**
 * ä¼¦ç†å®¡æŸ¥ä¸“家意见Service接口
@@ -26,4 +27,6 @@
    public Page<ServiceEthicalreviewopinions> queryListByPage(ServiceEthicalreviewopinions serviceEthicalreviewopinions);
    List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO);
    List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import lombok.extern.slf4j.Slf4j;
@@ -202,4 +203,9 @@
        return ethicalReviewVOS;
    }
    public List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo) {
        return serviceEthicalreviewopinionsMapper.expertTotal(DonorNo);
    }
}
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -50,7 +50,12 @@
               update_time,
               judgment_description,
               ext_content,
               state
               state,
               heartDeathTime
               heartDeathReason
               heartDeathJudgeDoctO
               heartDeathJudgeDoctT
               heartDeathJudgeAnnex
        from service_deathinfo
    </sql>
@@ -111,7 +116,12 @@
        sdi.RememberAnnex as rememberannex,
        sdi.ResponsibleUserID as responsibleuserid,
        sdi.ResponsibleUserName as responsibleusername,
        sdi.state
        sdi.state,
        sdi.heartDeathTime as heartdeathtime,
        sdi.heartDeathReason as heartdeathreason,
        sdi.heartDeathJudgeDoctO as heartdeathjudgedocto,
        sdi.heartDeathJudgeDoctT as heartdeathjudgedoctt,
        sdi.heartDeathJudgeAnnex as heartdeathjudgeannex
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -103,7 +103,8 @@
        se.expert_opinion as expertOpinion,
        se.expert_time as expertTime,
        se.status as status,
        se.file_patch as filePatch
        se.file_patch as filePatch,
        se.sigin
        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/ServiceEthicalreviewopinionsMapper.xml
@@ -186,4 +186,20 @@
          and create_time &lt;= #{endtime}
    </select>
    <select id="expertTotal" resultType="com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO">
        SELECT COUNT(*) count,SUM(CASE WHEN receive_status = 1 THEN 1 ELSE 0 END) AS acceptCount,
        SUM(CASE WHEN receive_status =0  THEN 1 ELSE 0 END) AS notAcceptCount,
        SUM(CASE WHEN ExpertOpinion IS not null THEN 1 ELSE 0 END) AS opinionCount,
        SUM(CASE WHEN ExpertOpinion IS null THEN 1 ELSE 0 END) AS notApinionCount,
        SUM(CASE WHEN ConclusionAnnex IS not null THEN 1 ELSE 0 END) AS annexCount,
        SUM(CASE WHEN ConclusionAnnex IS null THEN 1 ELSE 0 END) AS notAnnexCount
        FROM service_ethicalreviewopinions
        <where>
            <if test="DonorNo != null ">DonorNo = #{DonorNo}</if>
        </where>
        GROUP BY receive_status,ExpertOpinion,ConclusionAnnex
    </select>
</mapper>