捐献基础增加入院时间,捐献上报基础增加入院时间

sinake

3 天以前 4c141764d64c37c4c27e372cd55d9e861b192c28

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

@@ -22,6 +22,7 @@
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
@@ -121,11 +122,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);
@@ -1001,9 +1003,9 @@
     */
    @ApiOperation("获取捐献工作流")
    @GetMapping(value = "/getWorkFlow/{id}")
    public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
    public WorkFlowVO getWorkFlow(@PathVariable("id") Long id) {
        log.info("获取捐献工作流：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
        return serviceDonatebaseinfoService.getWorkFlow(id);
    }

}