Merge remote-tracking branch 'origin/master'

liusheng

2025-09-25 a7f132bc723df88c95b469260eb79ac247463442

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -325,6 +325,18 @@
    }

    /**
     * 获取随访统计比例
     */
    @ApiOperation("获取随访满意度统计")
    @PostMapping("/getSfStatisticsJoy")
    public AjaxResult getSfStatisticsJoy(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
        if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
            return error("服务类型不能为空");
        }
        return success(serviceSubtaskService.getSfStatisticsJoy(serviceSubtaskCountReq));
    }

    /**
     * 随访统计导出
     */
    //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@@ -336,4 +348,30 @@
        util.exportExcel(response, sfStatistics, "随访统计导出");
    }

    /**
     * 随访统计导出
     */
    @ApiOperation("服务统计查询-按时间维度统计出院/门诊随访数据")
    @PostMapping("/getServiceStatistics")
    public AjaxResult getServiceStatistics(@RequestBody ServiceStatisticsRequest serviceStatisticsRequest) {
        SysUser user = getLoginUser().getUser();
        serviceStatisticsRequest.setOrgid(user.getOrgid());
        List<ServiceStatisticsResponse> serviceStatistics = serviceSubtaskService.getServiceStatistics(serviceStatisticsRequest);
        return success(serviceStatistics);
    }


    /**
     * 获取随访统计比例
     */
    @ApiOperation("获取随访满意度明细")
    @PostMapping("/getSfStatisticsJoydetails")
    public AjaxResult getSfStatisticsJoydetails(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
        if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size()==0&&
                serviceSubtaskCountReq.getDeptcodes().size()==0) {
            return error("科室或病区不能为空");
        }
        return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
    }

}