ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -121,11 +121,12 @@ //获取捐献进程进度 Map<Integer, Long> terminationCase = total.stream().filter(Objects::nonNull).map(DonatebaseinfoProgressDTO::getTerminationCase).filter(Objects::nonNull).collect(Collectors.groupingBy(type -> type, Collectors.counting())); List<Map<String,Object>> totals= serviceDonatebaseinfoService.totalConfirmationBaseInfo(donatebaseinfoProgressVO); //数据封装 Map<String, Object> map = new HashMap<>(); map.put("terminationCase", terminationCase); map.put("donatebaseinfoProgressDTOS", donatebaseinfoProgressDTOS); map.put("total", totals); if (!CollectionUtils.isEmpty(total)) totalCount = total.size(); return getDataTable(map, totalCount); ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java
@@ -5,10 +5,12 @@ import java.util.Date; import java.util.List; import java.util.Map; import com.ruoyi.project.domain.ServiceDonatebaseinfo; import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO; import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO; import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO; import com.ruoyi.project.domain.vo.TimeVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -57,6 +59,8 @@ List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO); List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO); ServiceDonatebaseinfo getById(Long infoid); int countByRecordState(@Param("recordState") String recordState, @Param("starttime") Date starttime, @Param("endtime") Date endtime); ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import java.util.Map; import com.ruoyi.project.domain.ServiceRelativesconfirmation; import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO; ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
@@ -8,6 +8,7 @@ import com.ruoyi.project.domain.ServiceDonatebaseinfo; import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO; import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO; import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO; import com.ruoyi.project.domain.vo.TimeVO; import com.ruoyi.project.domain.vo.countByRecordStateVO; import org.apache.xmlbeans.impl.xb.xsdschema.Public; @@ -51,6 +52,8 @@ List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO); List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO); String gethqzz(Long infoid); countByRecordStateVO countByRecordState(TimeVO timeVO); @@ -58,4 +61,6 @@ String getDonateNameById(Long infoid); Map<String, Object> getWorkFlow(Long id); } ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java
@@ -1,6 +1,8 @@ package com.ruoyi.project.service; import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.project.domain.ServiceRelativesconfirmation; import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO; @@ -30,4 +32,6 @@ List<RelativeConfirmationVO> selectVOList(RelativeConfirmationVO relativeConfirmationVO); List<RelativeConfirmationBaseInfoDTO> confirmationBaseInfoList(RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -128,6 +128,7 @@ serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName()); serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType()); serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin()); serviceDonatebaseinfo1.setRecordstate("0"); //先通过caseNo查询是否存在 ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo(); serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo()); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -254,6 +254,11 @@ } @Override public List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO) { return serviceDonatebaseinfoMapper.totalConfirmationBaseInfo(donatebaseinfoProgressVO); } @Override public String gethqzz(Long infoid) { return serviceDonatebaseinfoMapper.gethqzz(infoid); } ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -478,4 +478,34 @@ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if> </select> <select id="totalConfirmationBaseInfo" resultType="Map"> SELECT recordstate AS recordState, count(recordstate) AS stateCount FROM service_donatebaseinfo sd LEFT JOIN service_medicalevaluation sm ON sd.ID = sm.InfoID AND sm.del_flag = 0 -- 捐献评估 LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID AND sr.del_flag = 0-- 捐献确认 LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID AND se.del_flag = 0-- 伦理审查 LEFT JOIN service_donationwitness sdw ON sd.ID = sdw.InfoID AND sdw.del_flag = 0-- 获取见证 LEFT JOIN service_donatecompletioninfo sdt ON sd.ID = sdt.InfoID AND sdt.del_flag = 0 -- 完成登记 <where>sd.del_flag = 0 <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if> <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if> <if test="name != null ">AND sd.Name like concat('%', #{name}, '%')</if> <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if> <if test="startAge != null">AND sd.age >= #{startAge}</if> <if test="endAge !=null">AND sd.age <= #{endAge} </if> <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if> <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if> <if test="workflow != null">and sd.workflow = #{workflow}</if> <if test="diagnosisName != null">and sd.DiagnosisName like concat('%', #{diagnosisName}, '%')</if> </where> GROUP BY recordstate </select> </mapper> ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -341,4 +341,5 @@ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if> </select> </mapper>
