Merge remote-tracking branch 'origin/master'

陈昶聿

12 小时以前 0d10bc99eec75672b049339399e4f762fbd9746e

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

@@ -121,14 +121,8 @@
    @Log(title = "患者满意度", businessType = BusinessType.INSERT)
    @PostMapping("/batchinsert")
    public AjaxResult batchinsert(@RequestBody List<PatSatisfaction> patSatisfaction) {
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        for (PatSatisfaction patSatisfaction1 : patSatisfaction) {
            patSatisfaction1.setCreateBy(user.getNickName());
            patSatisfaction1.setOrgid(user.getOrgid());
            patSatisfactionService.insertPatSatisfaction(patSatisfaction1);
        }
        return toAjax(1);
        Integer row = patSatisfactionService.batchInsert(patSatisfaction);
        return toAjax(row);
    }

    /**
@@ -167,15 +161,37 @@
        PatSatisfactionResVO statistics = patSatisfactionService.statistics(patSatisfactionReqVO);
        return getDataTable3(CollectionUtils.isNotEmpty(statistics.getPatSatisfactionDetailEntities()) ? statistics.getPatSatisfactionDetailEntities().size() : 0, statistics);
    }

    /**
    /**
     * 患者满意度统计（维度）
     */
    @ApiOperation("患者满意度统计（维度）")
    @PostMapping("/statisticsByDimension")
    public Map<String, Object> statisticsByDimension(@RequestBody PatSatisfactionReqVO patSatisfactionReqVO) {
        //后端不做分页了，由前端做
        PatSatisfactionResVO statistics = patSatisfactionService.statisticsByDimension(patSatisfactionReqVO);
        return getDataTable3(CollectionUtils.isNotEmpty(statistics.getPatSatisfactionDetailEntities()) ? statistics.getPatSatisfactionDetailEntities().size() : 0, statistics);
    }
    /**
     * 患者满意度柱状图信息
     */
    @ApiOperation("患者满意度柱状图信息")
    @ApiOperation("患者满意度柱状图信息（分类)")
    @PostMapping("/satisfactionGraph")
    public Map<String, Object> satisfactionGraph(@RequestBody PatSatisfactionReqVO patSatisfactionReqVO) {
        Map<String, Object> patSatisfactionGraphResVOS = patSatisfactionService.satisfactionGraph(patSatisfactionReqVO);
        return getDataTable3(0, patSatisfactionGraphResVOS);
    }

    /**
     * 患者满意度柱状图信息
     */
    @ApiOperation("患者满意度柱状图信息(维度)")
    @PostMapping("/satisfactionGraphDimension")
    public Map<String, Object> satisfactionGraphDimension(@RequestBody PatSatisfactionReqVO patSatisfactionReqVO) {
        Map<String, Object> patSatisfactionGraphResVOS = patSatisfactionService.satisfactionGraphDimension(patSatisfactionReqVO);
        return getDataTable3(0, patSatisfactionGraphResVOS);
    }


}