新版统计

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -1757,7 +1757,7 @@ public class StatisticsEsService {
        List<JSONObject> result = new ArrayList<>();
//        if (saveModels != null && saveModels.size() >0) {
        List<Map<String, Object>> resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(DateUtil.getNextDay(endDate, 1)));
        List<Map<String, Object>> resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(DateUtil.getNextDay(dateFormat.parse(endDate), 1)));
//            result.clear();
        for (Map<String, Object> one : resultList) {
            JSONObject json = new JSONObject();
@@ -4283,43 +4283,43 @@ public class StatisticsEsService {
     * 文章数据转换
     * @param level
     * @param lowLevel
     * @param endConsult
     * @param
     * @param total
     * @return
     */
    public List<Map<String, Object>> getArticleCoutList(Integer level, String lowLevel, List<SaveModel> endConsult, List<SaveModel> total, List<SaveModel> haveReceive,List<SaveModel> noReceive,List<SaveModel> concle) {
        Map<String, Object> endMap = new HashMap<>();
    public List<Map<String, Object>> getArticleCoutList(Integer level, String lowLevel, List<SaveModel> publishType, List<SaveModel> total, List<SaveModel> pinlun,List<SaveModel> dianzang,List<SaveModel> collect) {
        Map<String, Object> publishTypeMap = new HashMap<>();
        Map<String, Object> totalMap = new HashMap<>();
        Map<String, Object> noReceiveMap = new HashMap<>();
        Map<String, Object> concleMap = new HashMap<>();
        Map<String, Object> haveReceiveMap = new HashMap<>();
        Map<String, Object> pinglunMap = new HashMap<>();
        Map<String, Object> dianzangMap = new HashMap<>();
        Map<String, Object> collectMap = new HashMap<>();
        org.json.JSONObject result = new org.json.JSONObject();
        String low_level = StringUtils.isEmpty(lowLevel) ? String.valueOf(level + 1) : lowLevel;
        //转换结束数
        for (SaveModel saveModel : endConsult) {
        //文章发布类型数
        for (SaveModel saveModel : publishType) {
            if (SaveModel.doctorLevel.equals(low_level)) {
                endMap.put(saveModel.getDoctor(), saveModel);
                publishTypeMap.put(saveModel.getDoctor(), saveModel);
            } else if (SaveModel.deptLevel.equals(low_level)) {
                endMap.put(saveModel.getDept(), saveModel);
                publishTypeMap.put(saveModel.getDept(), saveModel);
            }else if (SaveModel.OrgLevel.equals(low_level)) {
                endMap.put(saveModel.getHospital(), saveModel);
                publishTypeMap.put(saveModel.getHospital(), saveModel);
            }
        }
        //转换已接诊
        for (SaveModel saveModel : haveReceive) {
        //评论数
        for (SaveModel saveModel : pinlun) {
            if (SaveModel.doctorLevel.equals(low_level)) {
                haveReceiveMap.put(saveModel.getDoctor(), saveModel);
                pinglunMap.put(saveModel.getDoctor(), saveModel);
            } else if (SaveModel.deptLevel.equals(low_level)) {
                haveReceiveMap.put(saveModel.getDept(), saveModel);
                pinglunMap.put(saveModel.getDept(), saveModel);
            }else if (SaveModel.OrgLevel.equals(low_level)) {
                haveReceiveMap.put(saveModel.getHospital(), saveModel);
                pinglunMap.put(saveModel.getHospital(), saveModel);
            }
        }
        //转换总咨询数
        //转换发布数
        for (SaveModel saveModel : total) {
            if (SaveModel.doctorLevel.equals(low_level)) {
                totalMap.put(saveModel.getDoctor(), saveModel);
@@ -4330,25 +4330,25 @@ public class StatisticsEsService {
            }
        }
        //转换未接诊
        for (SaveModel saveModel : noReceive) {
        //转换点赞数
        for (SaveModel saveModel : dianzang) {
            if (SaveModel.doctorLevel.equals(low_level)) {
                noReceiveMap.put(saveModel.getDoctor(), saveModel);
                dianzangMap.put(saveModel.getDoctor(), saveModel);
            } else if (SaveModel.deptLevel.equals(low_level)) {
                noReceiveMap.put(saveModel.getDept(), saveModel);
                dianzangMap.put(saveModel.getDept(), saveModel);
            }else if (SaveModel.OrgLevel.equals(low_level)) {
                noReceiveMap.put(saveModel.getHospital(), saveModel);
                dianzangMap.put(saveModel.getHospital(), saveModel);
            }
        }
        //转换已取消
        for (SaveModel saveModel : concle) {
        //转换收藏数
        for (SaveModel saveModel : collect) {
            if (SaveModel.doctorLevel.equals(low_level)) {
                concleMap.put(saveModel.getDoctor(), saveModel);
                collectMap.put(saveModel.getDoctor(), saveModel);
            } else if (SaveModel.deptLevel.equals(low_level)) {
                concleMap.put(saveModel.getDept(), saveModel);
                collectMap.put(saveModel.getDept(), saveModel);
            }else if (SaveModel.OrgLevel.equals(low_level)) {
                concleMap.put(saveModel.getHospital(), saveModel);
                collectMap.put(saveModel.getHospital(), saveModel);
            }
        }
@@ -4356,25 +4356,25 @@ public class StatisticsEsService {
        List<Map<String, Object>> resultMaps = new ArrayList<>();
        for (String key : totalMap.keySet()) {
            Map<String, Object> rs = new HashMap<>();
            SaveModel endRs = (SaveModel) endMap.get(key);
            SaveModel publishTypeRs = (SaveModel) publishTypeMap.get(key);
            SaveModel totalRs = (SaveModel) totalMap.get(key);
            SaveModel concleRs = (SaveModel) concleMap.get(key);
            SaveModel noReceiveRs = (SaveModel) noReceiveMap.get(key);
            SaveModel haveReceiveRs = (SaveModel) haveReceiveMap.get(key);
            endRs = endRs==null?new SaveModel():endRs;
            SaveModel pinglunRs = (SaveModel) pinglunMap.get(key);
            SaveModel dianzangRs = (SaveModel) dianzangMap.get(key);
            SaveModel collectRs = (SaveModel) collectMap.get(key);
            publishTypeRs = publishTypeRs==null?new SaveModel():publishTypeRs;
            totalRs = totalRs==null?new SaveModel():totalRs;
            concleRs = concleRs==null?new SaveModel():concleRs;
            noReceiveRs = noReceiveRs==null?new SaveModel():noReceiveRs;
            haveReceiveRs = haveReceiveRs==null?new SaveModel():haveReceiveRs;
            pinglunRs = pinglunRs==null?new SaveModel():pinglunRs;
            dianzangRs = dianzangRs==null?new SaveModel():dianzangRs;
            collectRs = collectRs==null?new SaveModel():collectRs;
            /*if (endRs == null || totalRs == null || concleRs == null || noReceiveRs==null || haveReceiveRs == null) {
                continue;
            }*/
            //合并结果集
            Integer totalNm = totalRs.getResult2().intValue();
            Integer endNm = endRs.getResult2().intValue();
            Integer concleNm = concleRs.getResult2().intValue();
            Integer noReceiveNm = noReceiveRs.getResult2().intValue();
            Integer haveReceiveNm = haveReceiveRs.getResult2().intValue();
            Integer pubilshTypeNm = publishTypeRs.getResult2().intValue();
            Integer pinglunNm = pinglunRs.getResult2().intValue();
            Integer dianzangNm = dianzangRs.getResult2().intValue();
            Integer collectNm = collectRs.getResult2().intValue();
//            rs.put("name", relyRs.get(area+"Name"));
            if (SaveModel.doctorLevel.equals(low_level)) {
                rs.put("name", totalRs.getDoctorName());
@@ -4383,16 +4383,15 @@ public class StatisticsEsService {
            } else if (SaveModel.OrgLevel.equals(low_level)) {
                rs.put("name", totalRs.getHospitalName());
            }
            rs.put("concleCount", concleNm);
            rs.put("endCount", endNm);
            rs.put("pinglunCount", pinglunNm);
            rs.put("publishTypeCount", pubilshTypeNm);
            rs.put("total", totalNm);
            rs.put("noReceiveCount", noReceiveNm);
            rs.put("haveReceiveCount", haveReceiveNm);
            rs.put("endAndReciveCount",endNm+haveReceiveNm);
            rs.put("dianzangCount", dianzangNm);
            rs.put("collectCount", collectNm);
            rs.put("code", key);
            resultMaps.add(rs);
        }
        //根据为咨询总数排序
        //根据为文章发布总数排序
        Collections.sort(resultMaps, new Comparator<Map<String, Object>>() {
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
@@ -5781,16 +5780,16 @@ public class StatisticsEsService {
            endDate = DateUtil.getCurrentYearEndTime() +" 23:59:59";
        }
        JSONObject object = new JSONObject();
        JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,"76",null,SaveModel.timeLevel_ZL,"1");//评论
        JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,"76","",SaveModel.timeLevel_ZL,"1");//评论
        object.put("pinglunTotalList",array);
        JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,"76",null,SaveModel.timeLevel_ZL,"2");//点赞
        JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,"76","",SaveModel.timeLevel_ZL,"2");//点赞
        object.put("dianzangTotalList",array);
        JSONArray array2 = dateTotalStatistics2(startDate,endDate,area,level,"76",null,SaveModel.timeLevel_ZL,"3");//收藏
        JSONArray array2 = dateTotalStatistics2(startDate,endDate,area,level,"76","",SaveModel.timeLevel_ZL,"3");//收藏
        object.put("collectTotalList",array);
        return object;
    }
    public JSONObject getArticleExcel(Integer flag,String startDate,String endDate,int level, String area, String lowLevel,String lowCode) throws Exception {
    public List<Map<String,Object>> getArticleExcel(Integer flag,String startDate,String endDate,int level, String area, String lowLevel,String lowCode) throws Exception {
        if (flag==1){
            startDate = DateUtil.getFirstMonthDay() +" 00:00:00";
            endDate = DateUtil.getLastMonthDay()+" 23:59:59";
@@ -5802,16 +5801,15 @@ public class StatisticsEsService {
            endDate = DateUtil.getCurrentYearEndTime() +" 23:59:59";
        }
        //文章发布数
        List<SaveModel> total = elasticsearchUtil.findListDateQuotaLevel2(startDate, endDate,level, area, "75", SaveModel.timeLevel_ZL, lowLevel,lowCode);//总数
        List<SaveModel> total = elasticsearchUtil.findListDateQuotaLevel1Empty(startDate, endDate,area,level, "75", SaveModel.timeLevel_ZL, lowLevel,lowCode);//总数
        //发布类型
        List<SaveModel> publishTypeTotal = elasticsearchUtil.findListDateQuotaLevel1Empty(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode);//发布类型
        //文章评论数
        List<SaveModel> pinlunTotal = elasticsearchUtil.findListDateQuotaLevel2(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode,"1");//评论
        List<SaveModel> pinlunTotal = elasticsearchUtil.findListDateQuotaLevel2Empty(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode,"1");//评论
        //文章点赞数
        List<SaveModel> dianzangTotal = elasticsearchUtil.findListDateQuotaLevel2(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode,"2");//点赞
        List<SaveModel> dianzangTotal = elasticsearchUtil.findListDateQuotaLevel2Empty(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode,"2");//点赞
        //文章收藏数
        List<SaveModel> collectTotal = elasticsearchUtil.findListDateQuotaLevel2(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode,"3");//收藏
/*
        result.put("resultList", getCoutListPC1(level, lowLevel, endTotal, total, haveReceiveTotal,noReceiveTotal,concleTotal));
*/
        return null;
        List<SaveModel> collectTotal = elasticsearchUtil.findListDateQuotaLevel2Empty(startDate, endDate, area, level, "76", SaveModel.timeLevel_ZL, lowLevel,lowCode,"3");//收藏
        return getArticleCoutList(level,lowLevel,publishTypeTotal,total,pinlunTotal,dianzangTotal,collectTotal);
    }
}

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -1224,36 +1224,46 @@ public class ElasticsearchUtil {
            }
        }
        if (SaveModel.doctorLevel.equals(low_level)) {
            sql.append("select doctor as doctor,doctorName as doctorName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1, sum(result2) as result2"+condition+"  from " + esIndex + " where ");
            groupBy.append("  group by doctor,doctorName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
            }
            sql.append("select doctor as doctor,doctorName as doctorName,sum(result1) as result1, sum(result2) as result2"+condition+"  from " + esIndex + " where ");
        }
        if (SaveModel.deptLevel.equals(low_level)) {
            sql.append("select dept as dept,deptName as deptName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1, sum(result2) as result2"+condition+"  from " + esIndex + " where ");
            groupBy.append("  group by dept,deptName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
            }
            sql.append("select dept as dept,deptName as deptName,sum(result1) as result1, sum(result2) as result2"+condition+"  from " + esIndex + " where ");
        } else if (SaveModel.OrgLevel.equals(low_level)) {
            sql.append("select hospital as hospital,hospitalName as hospitalName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1)  as result1,sum(result2) as result2"+condition+"  from " + esIndex + " where ");
            groupBy.append("  group by hospital,hospitalName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
            }
            sql.append("select hospital as hospital,hospitalName as hospitalName,sum(result1)  as result1,sum(result2) as result2"+condition+"  from " + esIndex + " where ");
        } else if (SaveModel.townLevel.equals(low_level)) {
            sql.append("select town as town,townName as townName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
            groupBy.append("  group by town,townName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
            }
            sql.append("select town as town,townName as townName,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
        } else if (SaveModel.cityLevel.equals(low_level)) {
            sql.append("select city as city,cityName as cityName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
            groupBy.append("  group by city,cityName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
            }
            sql.append("select city as city,cityName as cityName,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
        }
        if (StringUtils.isNotEmpty(area)) {
@@ -1484,23 +1494,31 @@ public class ElasticsearchUtil {
            }
        }
        if (SaveModel.doctorLevel.equals(low_level)) {
            sql.append("select doctor as doctor,doctorName as doctorName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2 "+condition+" from " + esIndex + " where ");
            groupBy.append("  group by doctor,doctorName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                condition.append(",slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name ");
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
            sql.append("select doctor as doctor,doctorName as doctorName,sum(result1) as result1,sum(result2) as result2 "+condition+" from " + esIndex + " where ");
        }else if (SaveModel.deptLevel.equals(low_level)) {
            sql.append("select dept as dept,deptName as deptName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
            groupBy.append("  group by dept,deptName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                condition.append(",slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name ");
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
            sql.append("select dept as dept,deptName as deptName,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
        } else if (SaveModel.OrgLevel.equals(low_level)) {
            sql.append("select hospital as hospital,hospitalName as hospitalName,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by hospital,hospitalName");
@@ -1511,23 +1529,29 @@ public class ElasticsearchUtil {
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
        } else if (SaveModel.townLevel.equals(low_level)) {
            sql.append("select town as town,townName as townName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
            groupBy.append("  group by town,townName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                condition.append(",slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name ");
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
            sql.append("select town as town,townName as townName,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
        } else if (SaveModel.cityLevel.equals(low_level)) {
            sql.append("select city as city,cityName as cityName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
            groupBy.append("  group by city,cityName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                condition.append(",slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name ");
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                condition.append(",slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name ");
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
            sql.append("select city as city,cityName as cityName,sum(result1) as result1,sum(result2) as result2"+condition+" from " + esIndex + " where ");
        }
        if (StringUtils.isNotEmpty(area)) {
@@ -2990,6 +3014,11 @@ public class ElasticsearchUtil {
        return list;
    }
    public List<SaveModel> findListDateQuotaLevel1Empty(String startDate, String endDate, String area, int level, String index, String timelevel, String lowLevel, String slaveKey1) throws Exception {
        List list = findDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, slaveKey1, null, lowLevel);
        return list;
    }
    /**
     * 列表
     * 2级维度
@@ -3064,6 +3093,11 @@ public class ElasticsearchUtil {
        return list;
    }
    public List<SaveModel> findListDateQuotaLevel2Empty(String startDate, String endDate, String area, int level, String index, String timelevel, String lowLevel, String slaveKey1, String slaveKey2) throws Exception {
        List list = findDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, slaveKey1, slaveKey2, null, lowLevel);
        return list;
    }
    /**
     * 将参数转换成需要的SaveModel里的标识
     *

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1488,6 +1488,7 @@ public class BaseHospitalRequestMapping {
        public static final String articleTotal = "/articleTotal";
        public static final String getArticlePublishList="/getArticlePublishList";
        public static final String getArticleOperateDateLine = "/getArticleOperateDateLine";
        public static final String getArticleExcel="/getArticleExcel";
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -4,6 +4,7 @@ package com.yihu.jw.hospital.endpoint.statistics;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.es.service.StatisticsEsService;
import com.yihu.jw.es.util.SaveModel;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -1046,4 +1047,31 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            return failedObjEnvelopException(e);
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.getArticleExcel)
    @ApiOperation(value = " 文章全院明细")
    public Envelop getArticleExcel(
            @ApiParam(name = "startDate", value = "开始时间", required = false)
            @RequestParam(value = "startDate",required = false) String startDate,
            @ApiParam(name = "endDate", value = "结束时间", required = false)
            @RequestParam(value = "endDate",required = false) String endDate,
            @ApiParam(name = "area", value = "区域编码 如 level2 area传市编码", required = true)
            @RequestParam(value = "area",required = true) String area,
            @ApiParam(name = "level", value = "2 市  3区  4医院 5、科室 6医生", required = true)
            @RequestParam(value = "level",required = true) int level,
            @ApiParam(name = "flag", value = "0自定义 1本月2近半年3本年", required = true)
            @RequestParam(value = "flag",required = true) Integer flag,
            @ApiParam(name = "lowLevel", value = "下一级区域等级   2 市  3区  4医院 5、科室 6医生", required = false)
            @RequestParam(value = "lowLevel",required = false) String lowLevel,
            @ApiParam(name = "lowCode", value = "", required = false)
            @RequestParam(value = "lowCode",required = false) String lowCode) {
        try {
            return success(statisticsEsService.getArticleExcel(flag,startDate, endDate,level,area,lowLevel,lowCode));
        } catch (Exception e) {
            e.printStackTrace();
            return failedObjEnvelopException(e);
        }
    }
}