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

@@ -100,6 +100,22 @@
    }

    /**
     * èŽ·å–伦理审查发起详细信息
     */
    @ApiOperation("InfoID获取伦理审查发起详细信息")
    @GetMapping(value = "/getInfoID")
    public AjaxResult getInfoId(Long InfoId) {
        QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
        ethicalreviewinitiateQueryWrapper.eq("InfoId",InfoId);
        ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getOne(ethicalreviewinitiateQueryWrapper);
        QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
        ethicalreviewopinionsWrapper.eq("nitiate_Id",serviceEthicalreviewinitiate.getId());
        List<ServiceEthicalreviewopinions>  ethicalreviewopinionsList= serviceEthicalreviewopinionsService.list(ethicalreviewopinionsWrapper);
        serviceEthicalreviewinitiate.setEthicalreviewopinionsList(ethicalreviewopinionsList);
        return AjaxResult.success(serviceEthicalreviewinitiate);
    }

    /**
     * æ–°å¢žä¼¦ç†å®¡æŸ¥å‘èµ·
     */
    @ApiOperation("新增伦理审查发起")
@@ -134,11 +150,11 @@
    public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate);
        if (result) {
            QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
            ethicalreviewopinionsWrapper.eq("nitiate_id",serviceEthicalreviewinitiate.getId());
            serviceEthicalreviewopinionsService.remove(ethicalreviewopinionsWrapper);
            for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){
                if(ObjectUtils.isNotEmpty(row.getId())){
                    serviceEthicalreviewopinionsService.updateById(row);
                }

                    serviceEthicalreviewopinionsService.save(row);
            }
            return AjaxResult.success();
        } else

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

@@ -8,6 +8,7 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
@@ -161,15 +162,15 @@

    @ApiOperation("专家统计详情")
    @GetMapping(value = "/expertTotal")
    public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {
        return serviceEthicalreviewopinionsService.expertTotal(expertNo);
    public Result<List<EthicalreviewopinionsTotalVO>> expertTotal(String expertNo) {
        return Result.success(serviceEthicalreviewopinionsService.expertTotal(expertNo)) ;
    }


    @ApiOperation("专家状态统计")
    @GetMapping(value = "/stateTotal")
    public List<EthicalreviewopinionsStateTotalVO> stateTotal(String expertNo) {
        return serviceEthicalreviewopinionsService.stateTotal(expertNo);
    public Result<List<EthicalreviewopinionsStateTotalVO>> stateTotal(String expertNo) {
        return Result.success(serviceEthicalreviewopinionsService.stateTotal(expertNo));
    }

}

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,132 @@
package com.ruoyi.common.core.domain;



import io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;


public class Result<T> implements Serializable {
    private static final long serialVersionUID = 1L;
    public static final int SUCCESS = 200;
    public static final int FAIL = 500;

    @ApiModelProperty("返回内容")
    private String msg = "成功";

    @ApiModelProperty("状态码")
    private Integer code = 0;

    @ApiModelProperty("总条数")
    private Long total = 0L;

    @ApiModelProperty("数据对象")
    private T data;

    public Result() {
    }

    public Result(Integer code, String msg) {
        this.code = code;
        this.msg = msg;
    }


    public static <T> Result<T> success() {
        Result<T> r = new Result();
        r.setCode(0);
        return r;
    }

    public static <T> Result<T> success(String msg) {
        Result<T> r = new Result();
        r.setCode(SUCCESS);
        r.setData((T) msg);
        return r;
    }

    public static <T> Result<T> success(T data) {
        Result<T> r = new Result();
        r.setCode(SUCCESS);
        r.setData(data);
        return r;
    }

    public static <T> Result<T> success(Long total, T data) {
        Result<T> r = new Result();
        r.setTotal(total);
        r.setCode(SUCCESS);
        r.setData(data);
        return r;
    }

    public static <T> Result<T> success(String msg, T data) {
        Result<T> r = new Result();
        r.setCode(SUCCESS);
        r.setMsg(msg);
        r.setData(data);
        return r;
    }


    public static <T> Result<T> error() {
        return error(FAIL, "操作失败");
    }

    public static <T> Result<T> error(String msg) {
        return error(FAIL, msg);
    }

    public static <T> Result<T> error(int code, String msg) {
        return error(code, msg, null);
    }

    public static <T> Result<T> error(int code, String msg, T data) {
        Result<T> r = new Result();
        r.setCode(code);
        r.setData(data);
        return r;
    }



    public static <T> Result<T> noauth(String msg) {
        return error(510, msg);
    }

    public String getMsg() {
        return this.msg;
    }

    public Integer getCode() {
        return this.code;
    }

    public Long getTotal() {
        return this.total;
    }

    public T getData() {
        return this.data;
    }

    public void setMsg(final String msg) {
        this.msg = msg;
    }

    public void setCode(final Integer code) {
        this.code = code;
    }

    public void setTotal(final Long total) {
        this.total = total;
    }

    public void setData(final T data) {
        this.data = data;
    }



}

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -70,7 +70,11 @@

    public static final String parseDateToStr(final String format, final Date date)
    {
        return new SimpleDateFormat(format).format(date);
        if(date==null){
            return "";
        }else {
            return new SimpleDateFormat(format).format(date);
        }
    }

    public static final Date dateTime(final String format, final String ts)

 ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -531,4 +531,8 @@
    {
        return (T) obj;
    }

    public static String nullTo1(Object s){
        return s==null?"1":s.toString();
    }
}

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

@@ -171,5 +171,13 @@
    @ApiModelProperty("签名")
    @Excel(name = "签名")
    private String sigin;

    @ApiModelProperty("发起人")
    @Excel(name = "发起人")
    private String  initiatePerson;

    @ApiModelProperty("发起主题")
    @Excel(name = "发起主题")
    private String  initiateTheme;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java

@@ -626,17 +626,7 @@
    @Excel(name = "接收状态0待接收1未接收2已接收3超时4中止5完成")
    private String receiveStatus;

    /** å‘起时间 */
    @ApiModelProperty("发起时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "发起时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date startTime;

    /** ç»“束时间 */
    @ApiModelProperty("结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    @ApiModelProperty("伦理审查id")
    @Excel(name = "伦理审查id")
@@ -646,4 +636,12 @@
    @Excel(name = "签名")
    private String sigin;

    @ApiModelProperty("专家类型")
    @Excel(name = "专家类型")
    private String expertType;

    @ApiModelProperty("伦理审查附件")
    @Excel(name = "伦理审查附件")
    private String  filePatch;

}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java

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

    @ApiModelProperty("发起人")
    @Excel(name = "发起人")
    private String  initiatePerson;

    @ApiModelProperty("发起主题")
    @Excel(name = "发起主题")
    private String  initiateTheme;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/WorkFlowVO.java

@@ -39,7 +39,7 @@
     * å°è£…器官分配
     */
    @ApiModelProperty("封装器官分配")
    Map<String, String> donateorgansService;
    Map<String, Object> donateorgansService;


    /**

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

@@ -304,6 +304,7 @@
        donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
        donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
        donatebaseinfo.put("createperson", null);
        donatebaseinfo.put("state",StringUtils.nullTo1(serviceDonatebaseinfo.getRecordstate()));
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
            SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
            if (!ObjectUtils.isEmpty(sysUser)) {
@@ -333,6 +334,7 @@
                medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
                medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
                medicalevaluation.put("createperson", null);
                medicalevaluation.put("state", StringUtils.nullTo1(StringUtils.nullTo1(serviceMedicalevaluations.get(0).getAssessState())));
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -365,6 +367,7 @@
                relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
                relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
                relativesconfirmation.put("createperson", null);
                relativesconfirmation.put("state", StringUtils.nullTo1(serviceRelativesconfirmations.get(0).getState()));
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -397,6 +400,7 @@
                donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
                donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
                donateflowcharts.put("createperson", null);
                donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getReceiveStatus()));
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -420,7 +424,7 @@
        map1.setDonateflowcharts(donateflowcharts);

        //封装器官分配
        Map<String, String> donateorgansService = new HashMap<>();
        Map<String, Object> donateorgansService = new HashMap<>();
       // if (serviceDonatebaseinfo.getWorkflow() >= 4) {
            ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
            serviceDonateorgan.setInfoid(id);
@@ -429,8 +433,8 @@
            if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
                donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
                donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");

                donateorgansService.put("createperson", null);
                donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.get(0).getAllocationstatus()));
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -460,8 +464,8 @@
            if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
                donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
                donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");

                donationwitness.put("createperson", null);
                donationwitness.put("state", StringUtils.nullTo1(serviceDonationwitness.getWitnessState()));
                if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -493,8 +497,8 @@
            if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
                donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
                donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");

                donatecompletioninfo.put("createperson", null);
                donatecompletioninfo.put("state", StringUtils.nullTo1(serviceDonatecompletioninfos.get(0).getCompleteState()));
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -524,8 +528,8 @@
        if(donatemaintenanceEntityList.size()>0){
            donatemaintenance.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getCreateTime()));
            donatemaintenance.put("updatetime", donatemaintenanceEntityList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");

            donatemaintenance.put("createperson", null);
            donatemaintenance.put("state", StringUtils.nullTo1(donatemaintenanceEntityList.get(0).getState()));
            if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getCreateBy())) {
                SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getCreateBy());
                if (!ObjectUtils.isEmpty(sysUser)) {
@@ -552,8 +556,8 @@
        if(serviceDeathinfoList.size()>0){
            deathinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDeathinfoList.get(0).getCreateTime()));
            deathinfo.put("updatetime", serviceDeathinfoList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");

            deathinfo.put("createperson", null);
            deathinfo.put("state", StringUtils.nullTo1(serviceDeathinfoList.get(0).getState()));
            if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getCreateBy())) {
                SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getCreateBy());
                if (!ObjectUtils.isEmpty(sysUser)) {

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

@@ -104,7 +104,9 @@
        se.expert_time as expertTime,
        ifnull(se.status,0) as status,
        se.file_patch as filePatch,
        se.sigin
        se.sigin,
        se.initiate_theme,
        se.initiate_person
        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

@@ -138,13 +138,17 @@
        service_ethicalreviewopinions.ConclusionOrder as conclusionorder,
        service_ethicalreviewopinions.nitiate_id as nitiateId,
        service_ethicalreviewopinions.expert_no as expertNo,
        service_ethicalreviewopinions.start_time,
        service_ethicalreviewopinions.end_time,
        service_ethicalreviewopinions.expert_type,
        c.file_patch,
        service_ethicalreviewopinions.sigin as sigin
        FROM   service_donatebaseinfo
        LEFT JOIN  service_ethicalreviewopinions
        ON service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
        LEFT JOIN base_organization ON
        base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo

        left join service_ethicalreviewinitiate c on c.InfoID=service_donatebaseinfo.id
        <where>
            service_donatebaseinfo.del_flag=0
            and service_ethicalreviewopinions.del_flag=0
@@ -155,8 +159,8 @@
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and
                `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
            </if>
            <if test="recordstate != null  and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
                #{recordstate}
            <if test="recordstate != null  and recordstate != ''">
                and `service_donatebaseinfo`.`RecordState` = #{recordstate}
            </if>
            <if test="caseNo != null  and caseNo != ''">and `service_donatebaseinfo`.`case_no` =
                #{caseNo}
@@ -174,6 +178,12 @@
            <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
            <if test="nitiateId != null ">and `service_ethicalreviewopinions`.`nitiate_id` = #{nitiateId}</if>
            <if test="expertNo != null ">and `service_ethicalreviewopinions`.`expert_no` = #{expertNo}</if>
            <if test="receiveStatus != null  and receiveStatus != ''">
                and `service_ethicalreviewopinions`.`receive_status` in(${receiveStatus})
            </if>
            <if test="expertname != null ">and `service_ethicalreviewopinions`.`expertname` = #{expertname}</if>
            <if test="expertconclusion != null ">and `service_ethicalreviewopinions`.`expertconclusion` = #{expertconclusion}</if>

        </where>

        order by `service_ethicalreviewopinions`.`ConclusionTime` desc
@@ -219,7 +229,7 @@
            <if test="expertNo != null ">expert_no = #{expertNo}</if>
        </where>

        GROUP BY receive_status

    </select>

</mapper>