代码提交

liusheng

2023-12-25 2b7ad68415a5bced753fa76699fa16ee3142859b

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

@@ -122,6 +122,9 @@
        if (serviceDonateorgan.getTransplanttime() != null) {
            wrappers.eq(ServiceDonateorgan::getTransplanttime, serviceDonateorgan.getTransplanttime());
        }
        if (serviceDonateorgan.getEstimatedtime() != null) {
            wrappers.eq(ServiceDonateorgan::getEstimatedtime, serviceDonateorgan.getEstimatedtime());
        }
        return this.list(wrappers);
    }

@@ -448,7 +451,8 @@
        donateNumber.setNumberOfDonate(serviceDonatebaseinfoMapper.countNumber(timeVO));
        donateNumber.setNumberOfMedicalEvaluation(serviceMedicalevaluationMapper.countNumber(timeVO));
        donateNumber.setNumberOfRelativeConfirmation(serviceRelativesconfirmationMapper.countNumber(timeVO));
        donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
//        donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
        donateNumber.setNumberOfDonatePeople(serviceDonateorganMapper.countNumber(timeVO));
        donateNumber.setNumberOfOrgans(serviceDonateorganMapper.countNumber(timeVO));
        donateNumber.setNumberOfWitness(serviceDonationwitnessMapper.countNumber(timeVO));
        donateNumber.setNumberOfEthicalReview(serviceEthicalreviewopinionsMapper.countNumber(timeVO));
@@ -748,6 +752,10 @@
    @Transactional(rollbackFor = Exception.class)
    public List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans) {
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
            if (serviceDonateorgan.getInfoid() == null) {
                throw new BaseException("未关联捐献基础信息，infoid为空了" + serviceDonateorgan);
            }

            String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
            if (StringUtils.isEmpty(serviceDonateorgan.getDonorno()) || StringUtils.isEmpty(serviceDonateorgan.getOrganno())) {
                throw new BaseException("新增时生成的编号为空,创建失败(请检查捐献者编号和器官类别)! ：" + serviceDonateorgan.toString());
@@ -764,20 +772,33 @@
            boolean save = this.save(serviceDonateorgan);


            //保存service_organallocation
            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
            serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
            serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
            serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
            serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
            serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
            serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
            log.info("serviceOrganallocation的数据为: {}", serviceOrganallocation);
            serviceOrganallocationService.save(serviceOrganallocation);
//            //保存service_organallocation
//            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
//            serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
//            serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
//            serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
//            serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
//            serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
//            serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
//            log.info("serviceOrganallocation的数据为: {}", serviceOrganallocation);
//            serviceOrganallocationService.save(serviceOrganallocation);
        }
        return serviceDonateorgans;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans) {
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
            if (serviceDonateorgan.getId() == null) {
                throw new BaseException("id为空了 ：" + serviceDonateorgan);
            }
            this.updateById(serviceDonateorgan);
        }
        //将带ID的数据返回
        return true;
    }


//    @Override
//    public List<DonateByRegionVO> OrgansOfHospitalByMonth() {