Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/EsStatisticsController.java

@@ -1601,19 +1601,19 @@ public class EsStatisticsController extends BaseController {
    //=================================长处方分析===============================================
    @RequestMapping("/getPrescriptionCount")
    @ResponseBody
    @ApiOperation("订单统计-顶部总数获取")
    public String getPrescriptionCount(@ApiParam(name="level", value="级别") @RequestParam(required = true)String level,
                                       @ApiParam(name="area", value="级别对应编码") @RequestParam(required = true)String area,
                                       @ApiParam(name="disease", value="疾病类型") @RequestParam(required = false)String disease){
        try{
            return write(200, "查询成功", "data", statisticsESService.getPrescriptionCount(elasticsearchUtil.changeLevel(Integer.valueOf(level)),area,disease));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
        }
    }
//    @RequestMapping("/getPrescriptionCount")
//    @ResponseBody
//    @ApiOperation("订单统计-顶部总数获取")
//    public String getPrescriptionCount(@ApiParam(name="level", value="级别") @RequestParam(required = true)String level,
//                                       @ApiParam(name="area", value="级别对应编码") @RequestParam(required = true)String area,
//                                       @ApiParam(name="disease", value="疾病类型") @RequestParam(required = false)String disease){
//        try{
//            return write(200, "查询成功", "data", statisticsESService.getPrescriptionCount(elasticsearchUtil.changeLevel(Integer.valueOf(level)),area,disease));
//        } catch (Exception e) {
//            error(e);
//            return error(-1, "查询失败");
//        }
//    }
    /**
     *年龄统计-下部列表（疾病维度）