From dcd3eb3bbbc25b01155493f20f5680fc6d4aee11 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 26 十月 2023 16:02:07 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 388 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 241 insertions(+), 147 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java index f44c036..fced001 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.entity.SysDictData; @@ -8,23 +9,24 @@ import com.ruoyi.project.domain.*; import com.ruoyi.project.domain.vo.*; import com.ruoyi.project.mapper.*; -import com.ruoyi.project.service.IServiceDonateorganService; +import com.ruoyi.project.service.*; import com.ruoyi.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; /** * 鎹愮尞鍣ㄥ畼绠$悊Service涓氬姟灞傚鐞� - * + * * @author ruoyi * @date 2021-11-10 */ @Service -public class ServiceDonateorganServiceImpl extends ServiceImpl<ServiceDonateorganMapper, ServiceDonateorgan> implements IServiceDonateorganService -{ +public class ServiceDonateorganServiceImpl extends ServiceImpl<ServiceDonateorganMapper, ServiceDonateorgan> implements IServiceDonateorganService { @Autowired ServiceDonateorganMapper serviceDonateorganMapper; @@ -56,62 +58,78 @@ @Autowired ServiceDonatecompletioninfoMapper serviceDonatecompletioninfoMapper; - @Autowired private SysDictDataMapper dictDataMapper; + @Autowired + private IServiceMedicalevaluationService serviceMedicalevaluationService; + + @Autowired + private IServiceRelativesconfirmationService serviceRelativesconfirmationService; + + @Autowired + private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService; + + @Autowired + private IServiceOrganallocationService serviceOrganallocationService; + + @Autowired + private IServiceDonationwitnessService serviceDonationwitnessService; + + @Autowired + private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService; /** * 鏌ヨ鎹愮尞鍣ㄥ畼绠$悊鍒楄〃 - * + * * @param serviceDonateorgan 鎹愮尞鍣ㄥ畼绠$悊 * @return 鎹愮尞鍣ㄥ畼绠$悊 */ @Override public List<ServiceDonateorgan> queryList(ServiceDonateorgan serviceDonateorgan) { LambdaQueryWrapper<ServiceDonateorgan> wrappers = Wrappers.lambdaQuery(); - if (StringUtils.isNotNull(serviceDonateorgan.getInfoid())){ - wrappers.eq(ServiceDonateorgan::getInfoid ,serviceDonateorgan.getInfoid()); + if (StringUtils.isNotNull(serviceDonateorgan.getInfoid())) { + wrappers.eq(ServiceDonateorgan::getInfoid, serviceDonateorgan.getInfoid()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getDonorno())){ - wrappers.eq(ServiceDonateorgan::getDonorno ,serviceDonateorgan.getDonorno()); + if (StringUtils.isNotBlank(serviceDonateorgan.getDonorno())) { + wrappers.eq(ServiceDonateorgan::getDonorno, serviceDonateorgan.getDonorno()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getOrganno())){ - wrappers.eq(ServiceDonateorgan::getOrganno ,serviceDonateorgan.getOrganno()); + if (StringUtils.isNotBlank(serviceDonateorgan.getOrganno())) { + wrappers.eq(ServiceDonateorgan::getOrganno, serviceDonateorgan.getOrganno()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getOrganname())){ - wrappers.like(ServiceDonateorgan::getOrganname ,serviceDonateorgan.getOrganname()); + if (StringUtils.isNotBlank(serviceDonateorgan.getOrganname())) { + wrappers.like(ServiceDonateorgan::getOrganname, serviceDonateorgan.getOrganname()); } - if (serviceDonateorgan.getOrganstate() != null){ - wrappers.eq(ServiceDonateorgan::getOrganstate ,serviceDonateorgan.getOrganstate()); + if (serviceDonateorgan.getOrganstate() != null) { + wrappers.eq(ServiceDonateorgan::getOrganstate, serviceDonateorgan.getOrganstate()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getOrgannumber())){ - wrappers.eq(ServiceDonateorgan::getOrgannumber ,serviceDonateorgan.getOrgannumber()); + if (StringUtils.isNotBlank(serviceDonateorgan.getOrgannumber())) { + wrappers.eq(ServiceDonateorgan::getOrgannumber, serviceDonateorgan.getOrgannumber()); } - if (serviceDonateorgan.getOrgangettime() != null){ - wrappers.eq(ServiceDonateorgan::getOrgangettime ,serviceDonateorgan.getOrgangettime()); + if (serviceDonateorgan.getOrgangettime() != null) { + wrappers.eq(ServiceDonateorgan::getOrgangettime, serviceDonateorgan.getOrgangettime()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getOrgangetdoct())){ - wrappers.eq(ServiceDonateorgan::getOrgangetdoct ,serviceDonateorgan.getOrgangetdoct()); + if (StringUtils.isNotBlank(serviceDonateorgan.getOrgangetdoct())) { + wrappers.eq(ServiceDonateorgan::getOrgangetdoct, serviceDonateorgan.getOrgangetdoct()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getGainhospitalno())){ - wrappers.eq(ServiceDonateorgan::getGainhospitalno ,serviceDonateorgan.getGainhospitalno()); + if (StringUtils.isNotBlank(serviceDonateorgan.getGainhospitalno())) { + wrappers.eq(ServiceDonateorgan::getGainhospitalno, serviceDonateorgan.getGainhospitalno()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getGainhospitalname())){ - wrappers.like(ServiceDonateorgan::getGainhospitalname ,serviceDonateorgan.getGainhospitalname()); + if (StringUtils.isNotBlank(serviceDonateorgan.getGainhospitalname())) { + wrappers.like(ServiceDonateorgan::getGainhospitalname, serviceDonateorgan.getGainhospitalname()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getTransplanthospitalno())){ - wrappers.eq(ServiceDonateorgan::getTransplanthospitalno ,serviceDonateorgan.getTransplanthospitalno()); + if (StringUtils.isNotBlank(serviceDonateorgan.getTransplanthospitalno())) { + wrappers.eq(ServiceDonateorgan::getTransplanthospitalno, serviceDonateorgan.getTransplanthospitalno()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getTransplanthospitalname())){ - wrappers.like(ServiceDonateorgan::getTransplanthospitalname ,serviceDonateorgan.getTransplanthospitalname()); + if (StringUtils.isNotBlank(serviceDonateorgan.getTransplanthospitalname())) { + wrappers.like(ServiceDonateorgan::getTransplanthospitalname, serviceDonateorgan.getTransplanthospitalname()); } - if (StringUtils.isNotBlank(serviceDonateorgan.getTransplantdoct())){ - wrappers.eq(ServiceDonateorgan::getTransplantdoct ,serviceDonateorgan.getTransplantdoct()); + if (StringUtils.isNotBlank(serviceDonateorgan.getTransplantdoct())) { + wrappers.eq(ServiceDonateorgan::getTransplantdoct, serviceDonateorgan.getTransplantdoct()); } - if (serviceDonateorgan.getTransplanttime() != null){ - wrappers.eq(ServiceDonateorgan::getTransplanttime ,serviceDonateorgan.getTransplanttime()); + if (serviceDonateorgan.getTransplanttime() != null) { + wrappers.eq(ServiceDonateorgan::getTransplanttime, serviceDonateorgan.getTransplanttime()); } return this.list(wrappers); } @@ -123,7 +141,7 @@ Map<String, Integer> map_donate = new HashMap<String, Integer>(); Map<String, Integer> map_accept = new HashMap<String, Integer>(); - for(ServiceDonateorgan s : serviceDonateorgans) { + for (ServiceDonateorgan s : serviceDonateorgans) { BaseOrganization org_donate = baseOrganizationMapper.getOrganizationByNumber(s.getGainhospitalno()); if (org_donate != null) { map_donate.put(org_donate.getCity(), map_donate.getOrDefault(org_donate.getCity(), 0) + 1); @@ -156,12 +174,12 @@ regions.add("9"); regions.add("A"); regions.add("B"); - for(String r : regions){ + for (String r : regions) { NumberOfOrgans numberOfOrgans = new NumberOfOrgans(); numberOfOrgans.setDistrict(r); numberOfOrgans.setNumberOfHospitals(baseOrganizationMapper.getOrganizationByCity(r)); - numberOfOrgans.setDonateNumber(map_donate.getOrDefault(r,0)); - numberOfOrgans.setAcceptNumber(map_accept.getOrDefault(r,0)); + numberOfOrgans.setDonateNumber(map_donate.getOrDefault(r, 0)); + numberOfOrgans.setAcceptNumber(map_accept.getOrDefault(r, 0)); list.add(numberOfOrgans); } @@ -175,20 +193,20 @@ Map<String, Integer> map_donate = new HashMap<String, Integer>(); Map<String, Integer> map_accept = new HashMap<String, Integer>(); - for(ServiceDonateorgan s : serviceDonateorgans){ - map_donate.put(s.getGainhospitalno(), map_donate.getOrDefault(s.getGainhospitalno(),0) + 1); + for (ServiceDonateorgan s : serviceDonateorgans) { + map_donate.put(s.getGainhospitalno(), map_donate.getOrDefault(s.getGainhospitalno(), 0) + 1); map_accept.put(s.getTransplanthospitalno(), map_accept.getOrDefault(s.getTransplanthospitalno(), 0) + 1); } List<BaseOrganization> baseOrganization = baseOrganizationMapper.getBaseOrganizationList(); - for(BaseOrganization o : baseOrganization){ + for (BaseOrganization o : baseOrganization) { OrgansOfHospital organsOfHospital = new OrgansOfHospital(); - if(cityName.equals(o.getCityname())) { + if (cityName.equals(o.getCityname())) { organsOfHospital.setHospitalName(o.getOrganizationname()); organsOfHospital.setHospitalNo(o.getMedicalcode()); - organsOfHospital.setDonateNumber(map_donate.getOrDefault(o.getMedicalcode(),0)); - organsOfHospital.setAcceptNumber(map_accept.getOrDefault(o.getMedicalcode(),0)); + organsOfHospital.setDonateNumber(map_donate.getOrDefault(o.getMedicalcode(), 0)); + organsOfHospital.setAcceptNumber(map_accept.getOrDefault(o.getMedicalcode(), 0)); list.add(organsOfHospital); } } @@ -237,10 +255,9 @@ int transferNumber = serviceDonationwitnessMapper.countThisYearByTime(timeVO); //鏈勾搴︽綔鍦ㄦ崘鐚�呮暟閲� int donateNumber = serviceDonatebaseinfoMapper.getDonateBaseCountThisYear(timeVO); - if(donateNumber == 0){ + if (donateNumber == 0) { og.setDonateTransferRate(0.0); - } - else { + } else { double transferRate = (double) transferNumber / (double) donateNumber; og.setDonateTransferRate(transferRate); } @@ -253,13 +270,12 @@ int DCDDonaterNumber = serviceDonationwitnessMapper.getDCDDonaterNumberThisYear(timeVO); //鏈勾搴BCD鏉ユ簮鍣ㄥ畼鎹愮尞鑰� int DBCDDonaterNumber = serviceDonationwitnessMapper.getDBCDDonaterNumberThisYear(timeVO); - if(transferNumber == 0){ + if (transferNumber == 0) { og.setOrganProductionRate(0.0); og.setDBDDonateRate(0.0); og.setDCDDonateRate(0.0); og.setDBCDDonateRate(0.0); - } - else{ + } else { double productionRate = (double) organTransplantNumber / (double) transferNumber; og.setOrganProductionRate(productionRate); @@ -285,14 +301,13 @@ //鏈勾搴︾梾鍘熻弻闃虫�ф暟閲� int pathogenPositiveNumber = serviceDonateorganMapper.getPathogenPositiveNumberThisYear(timeVO); - if(getOrganNumber == 0){ + if (getOrganNumber == 0) { og.setOrganUsedRate(0.0); og.setOrganBeforeGetCheckRate(0.0); og.setOrganAfterGetCheckRate(0.0); og.setMarginOrganRate(0.0); og.setGermPositiveRate(0.0); - } - else{ + } else { double organUsedRate = (double) organTransplantNumber / (double) getOrganNumber; og.setOrganUsedRate(organUsedRate); @@ -311,10 +326,9 @@ //鏈勾搴︽�籔NF鏁伴噺 int PNFNumber = serviceDonateorganMapper.getPNFNumberThisYear(timeVO); - if(organTransplantNumber == 0){ + if (organTransplantNumber == 0) { og.setTotalPNFRate(0.0); - } - else{ + } else { double PNFRate = (double) PNFNumber / (double) organTransplantNumber; og.setTotalPNFRate(PNFRate); } @@ -329,17 +343,17 @@ int countDCD = 0; //鏈勾搴BCD鏉ユ簮鍣ㄥ畼鏁伴噺 int countDBCD = 0; - for(ServiceDonateorgan l : list){ + for (ServiceDonateorgan l : list) { Long InfoId = l.getInfoid(); String category = serviceDonationwitnessMapper.getDonationCategoryByInfoId(InfoId); - if(category != null && category.equals("DBD")){ + if (category != null && category.equals("DBD")) { countDBD += 1; } - if(category != null && category.equals("DCD")){ + if (category != null && category.equals("DCD")) { countDCD += 1; } - if(category != null && category.equals("DBCD")){ + if (category != null && category.equals("DBCD")) { countDBCD += 1; } } @@ -350,16 +364,16 @@ int countDCDPNF = 0; //鏈勾搴BCD鏉ユ簮鍣ㄥ畼PNF鏁伴噺 int countDBCDPNF = 0; - for(ServiceDonateorgan s : list_PNF){ + for (ServiceDonateorgan s : list_PNF) { Long InfoId = s.getInfoid(); String category = serviceDonationwitnessMapper.getDonationCategoryByInfoId(InfoId); - if(category != null && category.equals("DBD")){ + if (category != null && category.equals("DBD")) { countDBDPNF += 1; } - if(category != null && category.equals("DCD")){ + if (category != null && category.equals("DCD")) { countDCDPNF += 1; } - if(category != null && category.equals("DBCD")){ + if (category != null && category.equals("DBCD")) { countDBCDPNF += 1; } } @@ -367,14 +381,12 @@ //鏈勾搴︽�籇GF鏁伴噺 int DGFNumber = serviceDonateorganMapper.getDGFNumberThisYear(timeVO); - if(organTransplantNumber == 0){ + if (organTransplantNumber == 0) { og.setTotalDGFRate(0.0); - } - else{ + } else { double DGFRate = (double) DGFNumber / (double) organTransplantNumber; og.setTotalDGFRate(DGFRate); } - //鏈勾搴BD鏉ユ簮鍣ㄥ畼DGF鏁伴噺 @@ -383,25 +395,24 @@ int countDCDDGF = 0; //鏈勾搴BCD鏉ユ簮鍣ㄥ畼DGF鏁伴噺 int countDBCDDGF = 0; - for(ServiceDonateorgan d : list_DGF){ + for (ServiceDonateorgan d : list_DGF) { Long InfoId = d.getInfoid(); String category = serviceDonationwitnessMapper.getDonationCategoryByInfoId(InfoId); - if(category != null && category.equals("DBD")){ + if (category != null && category.equals("DBD")) { countDBDDGF += 1; } - if(category != null && category.equals("DCD")){ + if (category != null && category.equals("DCD")) { countDCDDGF += 1; } - if(category != null && category.equals("DBCD")){ + if (category != null && category.equals("DBCD")) { countDBCDDGF += 1; } } - if(countDBD == 0){ + if (countDBD == 0) { og.setDBDPNFRate(0.0); og.setDBDDGFRate(0.0); - } - else{ + } else { double DBDPNFRate = (double) countDBDPNF / (double) countDBD; og.setDBDPNFRate(DBDPNFRate); @@ -409,11 +420,10 @@ og.setDBDDGFRate(DBDDGFRate); } - if(countDCD == 0){ + if (countDCD == 0) { og.setDCDPNFRate(0.0); og.setDCDDGFRate(0.0); - } - else{ + } else { double DCDPNFRate = (double) countDCDPNF / (double) countDCD; og.setDCDPNFRate(DCDPNFRate); @@ -421,11 +431,10 @@ og.setDCDDGFRate(DCDDGFRate); } - if(countDBCD == 0){ + if (countDBCD == 0) { og.setDBCDPNFRate(0.0); og.setDBCDDGFRate(0.0); - } - else{ + } else { double DBCDPNFRate = (double) countDBCDPNF / (double) countDBCD; og.setDBCDPNFRate(DBCDPNFRate); @@ -465,15 +474,15 @@ List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getAllDonateBaseInfo(); HashMap<String, Integer> map_baseinfo_count = new HashMap<String, Integer>(); - for(ServiceDonatebaseinfo s : serviceDonatebaseinfos){ + for (ServiceDonatebaseinfo s : serviceDonatebaseinfos) { Date dt = s.getReporttime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); - map_baseinfo_count.put(month, map_baseinfo_count.getOrDefault(month,0) + 1); + map_baseinfo_count.put(month, map_baseinfo_count.getOrDefault(month, 0) + 1); } - for(Map.Entry<String, Integer> entry: map_baseinfo_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_baseinfo_count.entrySet()) { DonateNumberByMonth d = new DonateNumberByMonth(); d.setDonatemonth(entry.getKey()); d.setDonatecount(entry.getValue()); @@ -489,33 +498,32 @@ List<DonateByRegionVO> l = new ArrayList<>(); List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getAllDonateBaseInfoByTime(timeVO); - for(BaseOrganization b : baseOrganizations){ + for (BaseOrganization b : baseOrganizations) { HashMap<String, Integer> map_baseinfo_count = new HashMap<String, Integer>(); HashMap<String, Integer> map_completion_count = new HashMap<String, Integer>(); //List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getBaseInfoByHospital(b.getOrganizationid()); List<ServiceDonatebaseinfo> serviceDonatebaseinfoOfThisHospital = new ArrayList<>(); - for(ServiceDonatebaseinfo sd : serviceDonatebaseinfos){ - if(b.getOrganizationid().equals(sd.getTreatmenthospitalno())){ + for (ServiceDonatebaseinfo sd : serviceDonatebaseinfos) { + if (b.getOrganizationid().equals(sd.getTreatmenthospitalno())) { serviceDonatebaseinfoOfThisHospital.add(sd); } } - for(ServiceDonatebaseinfo s : serviceDonatebaseinfoOfThisHospital){ + for (ServiceDonatebaseinfo s : serviceDonatebaseinfoOfThisHospital) { Date dt = s.getReporttime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); - map_baseinfo_count.put(month, map_baseinfo_count.getOrDefault(month,0) + 1); + map_baseinfo_count.put(month, map_baseinfo_count.getOrDefault(month, 0) + 1); ServiceDonatecompletioninfo sc = serviceDonatecompletioninfoMapper.getByInfoId(s.getId()); - if(sc != null){ - map_completion_count.put(month, map_completion_count.getOrDefault(month,0) + 1); - } - else{ - map_completion_count.put(month, map_completion_count.getOrDefault(month,0)); + if (sc != null) { + map_completion_count.put(month, map_completion_count.getOrDefault(month, 0) + 1); + } else { + map_completion_count.put(month, map_completion_count.getOrDefault(month, 0)); } } - for(Map.Entry<String, Integer> entry: map_baseinfo_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_baseinfo_count.entrySet()) { DonateByRegionVO d = new DonateByRegionVO(); d.setHospitalNumber(b.getOrganizationid()); d.setHospitalName(b.getOrganizationname()); @@ -537,37 +545,34 @@ List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getAllDonateBaseInfoByTime(timeVO); List<String> completeTreatmenthospitalnos = serviceDonatebaseinfoMapper.gettreatmenthospitalnoCompleteByTime(timeVO); - for(BaseOrganization b : baseOrganizations){ + for (BaseOrganization b : baseOrganizations) { HashMap<String, Integer> map_baseinfo_count = new HashMap<String, Integer>(); HashMap<String, Integer> map_completion_count = new HashMap<String, Integer>(); String Organizationid = b.getOrganizationid(); - for(ServiceDonatebaseinfo s : serviceDonatebaseinfos){ + for (ServiceDonatebaseinfo s : serviceDonatebaseinfos) { - if(Organizationid.equals(s.getTreatmenthospitalno())){ - map_baseinfo_count.put(Organizationid, map_baseinfo_count.getOrDefault(Organizationid,0) + 1); + if (Organizationid.equals(s.getTreatmenthospitalno())) { + map_baseinfo_count.put(Organizationid, map_baseinfo_count.getOrDefault(Organizationid, 0) + 1); } } - for(String sc : completeTreatmenthospitalnos){ - if(Organizationid.equals(sc)){ - map_completion_count.put(Organizationid, map_completion_count.getOrDefault(Organizationid,0) + 1); + for (String sc : completeTreatmenthospitalnos) { + if (Organizationid.equals(sc)) { + map_completion_count.put(Organizationid, map_completion_count.getOrDefault(Organizationid, 0) + 1); } } - if(map_baseinfo_count.size()==0) - { - map_baseinfo_count.put(Organizationid, map_baseinfo_count.getOrDefault(Organizationid,0)); + if (map_baseinfo_count.size() == 0) { + map_baseinfo_count.put(Organizationid, map_baseinfo_count.getOrDefault(Organizationid, 0)); } - if(map_completion_count.size()==0) - { - map_completion_count.put(Organizationid, map_completion_count.getOrDefault(Organizationid,0)); + if (map_completion_count.size() == 0) { + map_completion_count.put(Organizationid, map_completion_count.getOrDefault(Organizationid, 0)); } // for(Map.Entry<String, Integer> entry: map_baseinfo_count.entrySet()) { - if(map_baseinfo_count.get(b.getOrganizationid())>0 || map_completion_count.get(b.getOrganizationid())>0) - { + if (map_baseinfo_count.get(b.getOrganizationid()) > 0 || map_completion_count.get(b.getOrganizationid()) > 0) { DonateByRegionVO d = new DonateByRegionVO(); d.setHospitalNumber(b.getOrganizationid()); d.setHospitalName(b.getOrganizationname()); @@ -613,13 +618,13 @@ List<String> l2 = serviceDonatebaseinfoMapper.getDistrictComplete(); List<String> l3 = serviceDonatebaseinfoMapper.getDistrictOrgans(); - for(String s1 : l1){ + for (String s1 : l1) { map_donate.put(s1, map_donate.getOrDefault(s1, 0) + 1); } - for(String s2 : l2){ + for (String s2 : l2) { map_complete.put(s2, map_complete.getOrDefault(s2, 0) + 1); } - for(String s3 : l3){ + for (String s3 : l3) { map_organs.put(s3, map_organs.getOrDefault(s3, 0) + 1); } @@ -637,11 +642,11 @@ regions.add("A"); regions.add("B"); - for(String r : regions){ + for (String r : regions) { DistrictDonateCalculateVO d = new DistrictDonateCalculateVO(); d.setDistrict(r); - d.setDonateCount(map_donate.getOrDefault(r,0)); - d.setCompleteCount(map_complete.getOrDefault(r,0)); + d.setDonateCount(map_donate.getOrDefault(r, 0)); + d.setCompleteCount(map_complete.getOrDefault(r, 0)); d.setTotalOrganCount(map_organs.getOrDefault(r, 0)); l.add(d); } @@ -660,13 +665,13 @@ List<String> l2 = serviceDonatebaseinfoMapper.getDistrictCompleteByTime(timeVO); List<String> l3 = serviceDonatebaseinfoMapper.getDistrictOrgansByTime(timeVO); - for(String s1 : l1){ + for (String s1 : l1) { map_donate.put(s1, map_donate.getOrDefault(s1, 0) + 1); } - for(String s2 : l2){ + for (String s2 : l2) { map_complete.put(s2, map_complete.getOrDefault(s2, 0) + 1); } - for(String s3 : l3){ + for (String s3 : l3) { map_organs.put(s3, map_organs.getOrDefault(s3, 0) + 1); } @@ -684,11 +689,11 @@ regions.add("A"); regions.add("B"); - for(String r : regions){ + for (String r : regions) { DistrictDonateCalculateVO d = new DistrictDonateCalculateVO(); d.setDistrict(r); - d.setDonateCount(map_donate.getOrDefault(r,0)); - d.setCompleteCount(map_complete.getOrDefault(r,0)); + d.setDonateCount(map_donate.getOrDefault(r, 0)); + d.setCompleteCount(map_complete.getOrDefault(r, 0)); d.setTotalOrganCount(map_organs.getOrDefault(r, 0)); l.add(d); } @@ -707,7 +712,7 @@ map_organs.put(b.getOrganizationid(), count); } - for (Map.Entry<String, Integer> entry : map_organs.entrySet()){ + for (Map.Entry<String, Integer> entry : map_organs.entrySet()) { organNumberByOrgVO o = new organNumberByOrgVO(); o.setOrgId(entry.getKey()); o.setOrgName(baseOrganizationMapper.getNameByNo(entry.getKey())); @@ -725,21 +730,19 @@ Map<String, Integer> map_organs = new HashMap<String, Integer>(); //List<String> organNo = new ArrayList<>(); - List<SysDictData> data = dictDataMapper.selectDictDataByType("sys_Organ"); - if (StringUtils.isNull(data)) - { + List<SysDictData> data = dictDataMapper.selectDictDataByType("sys_Organ"); + if (StringUtils.isNull(data)) { data = new ArrayList<SysDictData>(); } - for(SysDictData sysDictData : data){ - if(!sysDictData.getDictValue().equals("C00")) - { - int count = serviceDonateorganMapper.getDistinctOrgansCount(sysDictData.getDictValue(),timeVO.getStarttime(),timeVO.getEndtime(),timeVO.getCity(),timeVO.getReporterno()); + for (SysDictData sysDictData : data) { + if (!sysDictData.getDictValue().equals("C00")) { + int count = serviceDonateorganMapper.getDistinctOrgansCount(sysDictData.getDictValue(), timeVO.getStarttime(), timeVO.getEndtime(), timeVO.getCity(), timeVO.getReporterno()); map_organs.put(sysDictData.getDictValue(), count); } } - for (Map.Entry<String, Integer> entry : map_organs.entrySet()){ + for (Map.Entry<String, Integer> entry : map_organs.entrySet()) { organInfoVO organ = new organInfoVO(); organ.setOrganNo(entry.getKey()); //organ.setOrganName(serviceDonateorganMapper.getOrganNameByNo(entry.getKey())); @@ -748,6 +751,98 @@ } return l; + } + + @Override + public Map<String, Object> getWorkFlow(Long id) { + //鐢ㄤ簬杩斿洖 + Map<String, Object> map = new ConcurrentHashMap<>(); + + ServiceDonateorgan serviceDonateorgan = getById(id); + if (ObjectUtils.isEmpty(serviceDonateorgan)) { + return null; + } + //灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁 + Map<String, String> donateorgan = new HashMap<>(); + donateorgan.put("createtime", serviceDonateorgan.getCreateTime().toString()); + donateorgan.put("updatetime", serviceDonateorgan.getUpdateTime().toString()); + donateorgan.put("process", ""); + + //灏佽鍖诲璇勪及 + Map<String, String> medicalevaluation = new HashMap<>(); + ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation(); + serviceMedicalevaluation.setInfoid(id); + List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation); + if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) { + medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString()); + medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString()); + medicalevaluation.put("process", ""); + } + + //灏佽鎹愮尞纭 + Map<String, String> relativesconfirmation = new HashMap<>(); + ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation(); + serviceRelativesconfirmation.setInfoid(id); + List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation); + if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) { + relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString()); + relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString()); + relativesconfirmation.put("process", ""); + } + + + //灏佽浼︾悊瀹℃煡 + Map<String, String> ethicalreviewopinions = new HashMap<>(); + ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions(); + serviceEthicalreviewopinions.setInfoid(id); + List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions); + if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) { + ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString()); + ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString()); + ethicalreviewopinions.put("process", ""); + } + + //灏佽鍣ㄥ畼鍒嗛厤 + Map<String, String> organallocationService = new HashMap<>(); + ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation(); + serviceOrganallocation.setOrganid(id); + List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation); + if (!CollectionUtils.isEmpty(serviceOrganallocations)) { + organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString()); + organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString()); + organallocationService.put("process", ""); + } + + //灏佽鑾峰彇瑙佽瘉 + Map<String, String> donationwitness = new HashMap<>(); + ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id); + if (!ObjectUtils.isEmpty(serviceDonationwitness)) { + donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString()); + donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString()); + donationwitness.put("process", ""); + } + + //灏佽瀹屾垚鐧昏 + Map<String, String> donatecompletioninfo = new HashMap<>(); + ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo(); + serviceDonatecompletioninfo.setInfoid(id); + List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo); + if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) { + donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString()); + donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString()); + donatecompletioninfo.put("process", ""); + } + + //灏嗘暟鎹皝闂紝骞惰繑鍥� + map.put("donateorgan", donateorgan); + map.put("medicalevaluation", medicalevaluation); + map.put("relativesconfirmation", relativesconfirmation); + map.put("ethicalreviewopinions", ethicalreviewopinions); + map.put("organallocationService", organallocationService); + map.put("donationwitness", donationwitness); + map.put("donatecompletioninfo", donatecompletioninfo); + + return map; } @@ -803,15 +898,15 @@ List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessMapper.getAllDonatePeopleByTime(timeVO); HashMap<String, Integer> map_organ_count = new HashMap<String, Integer>(); - for(ServiceDonationwitness s : serviceDonationwitnesses){ + for (ServiceDonationwitness s : serviceDonationwitnesses) { Date dt = s.getOperationbegtime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); - map_organ_count.put(month, map_organ_count.getOrDefault(month,0) + 1); + map_organ_count.put(month, map_organ_count.getOrDefault(month, 0) + 1); } - for(Map.Entry<String, Integer> entry: map_organ_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_organ_count.entrySet()) { DonateNumberByMonth d = new DonateNumberByMonth(); d.setDonatemonth(entry.getKey()); d.setDonatecount(entry.getValue()); @@ -828,15 +923,15 @@ List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoMapper.getCompletionDonatePeopleByTime(timeVO); HashMap<String, Integer> map_organ_count = new HashMap<String, Integer>(); - for(ServiceDonatecompletioninfo s : serviceDonatecompletioninfos){ + for (ServiceDonatecompletioninfo s : serviceDonatecompletioninfos) { Date dt = s.getCompletetime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); - map_organ_count.put(month, map_organ_count.getOrDefault(month,0) + 1); + map_organ_count.put(month, map_organ_count.getOrDefault(month, 0) + 1); } - for(Map.Entry<String, Integer> entry: map_organ_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_organ_count.entrySet()) { DonateNumberByMonth d = new DonateNumberByMonth(); d.setDonatemonth(entry.getKey()); d.setDonatecount(entry.getValue()); @@ -854,15 +949,15 @@ List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganMapper.getAllDonateOrgansByTime(timeVO); HashMap<String, Integer> map_organ_count = new HashMap<String, Integer>(); - for(ServiceDonateorgan s : serviceDonateorgans){ + for (ServiceDonateorgan s : serviceDonateorgans) { Date dt = s.getOrgangettime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); - map_organ_count.put(month, map_organ_count.getOrDefault(month,0) + 1); + map_organ_count.put(month, map_organ_count.getOrDefault(month, 0) + 1); } - for(Map.Entry<String, Integer> entry: map_organ_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_organ_count.entrySet()) { DonateNumberByMonth d = new DonateNumberByMonth(); d.setDonatemonth(entry.getKey()); d.setDonatecount(entry.getValue()); @@ -879,19 +974,19 @@ HashMap<String, Integer> map_organ_count = new HashMap<String, Integer>(); List<String> hospitals = new ArrayList<>(); - for(ServiceDonateorgan s : serviceDonateorgans){ + for (ServiceDonateorgan s : serviceDonateorgans) { Date dt = s.getOrgangettime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); String gainHospital = s.getGainhospitalno(); - if(!hospitals.contains(gainHospital)) { + if (!hospitals.contains(gainHospital)) { map_organ_count.put(month, map_organ_count.getOrDefault(month, 0) + 1); hospitals.add(gainHospital); } } - for(Map.Entry<String, Integer> entry: map_organ_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_organ_count.entrySet()) { DonateNumberByMonth d = new DonateNumberByMonth(); d.setDonatemonth(entry.getKey()); d.setDonatecount(entry.getValue()); @@ -908,19 +1003,19 @@ HashMap<String, Integer> map_organ_count = new HashMap<String, Integer>(); List<String> hospitals = new ArrayList<>(); - for(ServiceDonateorgan s : serviceDonateorgans){ + for (ServiceDonateorgan s : serviceDonateorgans) { Date dt = s.getOrgangettime(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(dt); String month = date.substring(0, 7); String acceptHospital = s.getTransplanthospitalno(); - if(!hospitals.contains(acceptHospital)) { + if (!hospitals.contains(acceptHospital)) { map_organ_count.put(month, map_organ_count.getOrDefault(month, 0) + 1); hospitals.add(acceptHospital); } } - for(Map.Entry<String, Integer> entry: map_organ_count.entrySet()) { + for (Map.Entry<String, Integer> entry : map_organ_count.entrySet()) { DonateNumberByMonth d = new DonateNumberByMonth(); d.setDonatemonth(entry.getKey()); d.setDonatecount(entry.getValue()); @@ -929,7 +1024,6 @@ return l; } - } -- Gitblit v1.9.3