捐献完成表新增亲属姓名

sinake

4 天以前 ea6526cfdca463b170fc70f471b46aab4c5d416a

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

@@ -14,6 +14,8 @@
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.EthicalreviewopinionsStateTotalVO;
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;
@@ -148,7 +150,12 @@
        if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getOrganType())) {
            wrappers.eq(ServiceEthicalreviewopinions::getOrganType, serviceEthicalreviewopinions.getOrganType());
        }

        if (ObjectUtils.isNotEmpty(serviceEthicalreviewopinions.getNitiateId())) {
            wrappers.eq(ServiceEthicalreviewopinions::getNitiateId, serviceEthicalreviewopinions.getNitiateId());
        }
        if (ObjectUtils.isNotEmpty(serviceEthicalreviewopinions.getExpertNo())) {
            wrappers.eq(ServiceEthicalreviewopinions::getExpertNo, serviceEthicalreviewopinions.getExpertNo());
        }
        int currentPage = (serviceEthicalreviewopinions.getPageNum() == null || serviceEthicalreviewopinions.getPageNum() < 1) ? 1 : serviceEthicalreviewopinions.getPageNum();
        int size = (serviceEthicalreviewopinions.getPageSize() == null || serviceEthicalreviewopinions.getPageSize() < 1) ? 10 : serviceEthicalreviewopinions.getPageSize();
        Page<ServiceEthicalreviewopinions> page = new Page<>(currentPage, size);
@@ -161,17 +168,7 @@
    @Override
    public List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO) {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        List<SysRole> l = user.getRoles();
        Boolean b = false;
        for (SysRole r : l) {
            if (r.getRoleId().longValue() == 3) {
                b = true;
            }
        }
        if (b) {
            ethicalReviewVO.setReporterno(user.getUserName());
        }

        List<EthicalReviewVO> ethicalReviewVOS = serviceEthicalreviewopinionsMapper.selectVOList(ethicalReviewVO);

        for (EthicalReviewVO ethicalReviewVO1 : ethicalReviewVOS) {
@@ -202,4 +199,23 @@
        return ethicalReviewVOS;
    }

    public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {

        return serviceEthicalreviewopinionsMapper.expertTotal(expertNo);
    }

    public Integer updateTimeOut() {
        return serviceEthicalreviewopinionsMapper.updateTimeOut();
    }

    public List<EthicalreviewopinionsStateTotalVO> stateTotal(String expertNo) {

        return serviceEthicalreviewopinionsMapper.stateTotal(expertNo);
    }

    public EthicalreviewopinionsStateTotalVO stateTotalAll(String nitiateId) {

        return serviceEthicalreviewopinionsMapper.stateTotalAll(nitiateId);
    }

}