代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/OpenStatisticsEndpoint.java

@@ -220,4 +220,16 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "statisticsOlderAge")
    @ApiOperation(value = "v1.1老人年龄分布")
    public ObjEnvelop statisticsOlderAge(
            @RequestParam(required = true) String endDate) {
        try {
            JSONObject result = statisticsService.statisticsOrderServer("50",endDate,2,"2");
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -637,28 +637,38 @@ public class StatisticsService {
            res.put("statusList",statusArray);
        }else{
            //老人
            //能力评估
            List<SaveModel> levelList = elasticsearchUtil.findDateAllQuotaLevel1(endDate, endDate, area, level, index, SaveModel.timeLevel_DDL,null,null,areaLevel);
            //能力评估 从签约时服务标签取
            JSONArray levelArray = new JSONArray();
            for(int i=0;i<levelList.size();i++){
                SaveModel saveModel = levelList.get(i);
            String sql = " select dict.dict_code,dict_value,count(DISTINCT lab.patient) total from wlyy_hospital_sys_dict dict \n" +
                    "LEFT JOIN wlyy_patient_label lab  on  dict.dict_code = lab.label_code AND  lab.label_type='1' " +
                    "where  dict.dict_name='service_type' and  dict.dict_code is not null and dict_code<>5  \n" +
                    " GROUP BY dict.dict_code; ";
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            String older = "  select count(DISTINCT patient) from wlyy_patient_label where label_type='1' ";
            Integer count = jdbcTemplate.queryForObject(older,Integer.class);
            for(Map<String,Object> map:list){
                JSONObject json = new JSONObject();
                json.put("num",saveModel.getResult2().longValue());
                json.put("code",saveModel.getSlaveKey1());
                json.put("name",saveModel.getSlaveKey1Name());
                DecimalFormat df = new DecimalFormat("0.00");
                json.put("rate", df.format((Integer.parseInt(map.get("total").toString())*1.00) / count * 100));
                json.put("num", map.get("total"));
                json.put("code",map.get("dict_code").toString());
                json.put("name",map.get("dict_value").toString());
                levelArray.add(json);
            }
            res.put("levelList",levelArray);
            //年龄分布
            List<SaveModel> ageList = elasticsearchUtil.findDateAllQuotaLevel3(endDate, endDate, area, level, index, SaveModel.timeLevel_DDL,null,null);
            //年龄分布 50
//            ageList = elasticsearchUtil.findDateAllQuotaLevel1(endDate, endDate, area, level, "50", SaveModel.timeLevel_DDL,null,null,"2");
            List<SaveModel>  ageList = statisticsUtilService.findDateAllQuotaLevel1Sort2(endDate,endDate,area,level,"50",SaveModel.timeLevel_DDL,null,null,"2");
            JSONArray ageArray = new JSONArray();
            for(int i=0;i<ageList.size();i++){
                SaveModel saveModel = ageList.get(i);
                JSONObject json = new JSONObject();
                json.put("num",saveModel.getResult2().longValue());
                json.put("code",saveModel.getSlaveKey3());
                json.put("name",saveModel.getSlaveKey3Name());
                json.put("code",saveModel.getSlaveKey1());
                json.put("name",saveModel.getSlaveKey1Name());
                ageArray.add(json);
            }
            res.put("ageList",ageArray);

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/compute/ComputeHelper.java

@@ -47,7 +47,7 @@ public class ComputeHelper {
            //计算数据 返回map key 根据团队和维度拼凑在map中的key   1-2-1  如果维度是长度是0返回团队id 1
            Map<String, List<DataModel>> computeMap = computeDataModel(dimensionQuotas, dataModels,wlyyJobCongId);
            List<SaveModel> savemodels = null;
            if ("45".equals(wlyyJobCongId)||"47".equals(wlyyJobCongId)){
            if ("45".equals(wlyyJobCongId)||"47".equals(wlyyJobCongId)||"50".equals(wlyyJobCongId)){
                savemodels = initAndSetResultCity( dimensionQuotas, computeMap, wlyyJobCongId, endTime, timeLevel);
            }else if("42".equals(wlyyJobCongId)||"41".equals(wlyyJobCongId)||"43".equals(wlyyJobCongId)||"46".equals(wlyyJobCongId)||"48".equals(wlyyJobCongId)
            ||"49".equals(wlyyJobCongId)){
@@ -79,7 +79,7 @@ public class ComputeHelper {
        Map<String, List<DataModel>> returnMap = new HashMap<>();
        dataModels.stream().forEach(one -> {
            String key;
            if ("45".equals(wlyyJobCongId)||"47".equals(wlyyJobCongId)){
            if ("45".equals(wlyyJobCongId)||"47".equals(wlyyJobCongId)||"50".equals(wlyyJobCongId)){
                key = getCityKey(one,dimensionQuotas.size());
            }
            else if("42".equals(wlyyJobCongId)||"41".equals(wlyyJobCongId)||"43".equals(wlyyJobCongId)||"46".equals(wlyyJobCongId)||"48".equals(wlyyJobCongId)