1

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

@@ -1894,8 +1894,18 @@ public class StatisticsService {
            res.put("statusList", statusArray);
        } else {//老人
            //老人
            //能力评估 从签约时服务标签取
            res.put("levelList", cloudCareForTheElderly(endDate, area, level));
            //能力评估 从签约时服务标签取  + 照护老人
            JSONArray jsonArray = cloudCareForTheElderly(endDate, area, level);
            JSONObject oldTotalJson = new JSONObject();
            String oldTotalSql ="SELECT ((SELECT COUNT(*) FROM base_patient p  WHERE p.sign_status = 1 AND p.del = 1 ) +(SELECT COUNT(p.id) FROM base_patient p INNER JOIN " +
                    " wlyy_patient_device d ON p.id = d.`user` WHERE p.sign_status = 0 AND p.del = 1  AND d.del = 0)) total";
            List<Integer> oldTotalList = jdbcTemplate.queryForList(oldTotalSql, Integer.class);
            oldTotalJson.put("num", oldTotalList.get(0));
            oldTotalJson.put("code", 12);
            oldTotalJson.put("name", "老人数");
            jsonArray.add(oldTotalJson);
            res.put("levelList", jsonArray);
            //居民健康标签
            List<SaveModel> list = elasticsearchUtil.findDateAllQuotaLevel1(endDate, endDate, area, level, "47", SaveModel.timeLevel_DDL, null, null, areaLevel);
@@ -1981,12 +1991,7 @@ public class StatisticsService {
            sexArray.add(json);
        }
        String oldTotalSql ="SELECT ((SELECT COUNT(*) FROM base_patient p  WHERE p.sign_status = 1 AND p.del = 1 ) +(SELECT COUNT(p.id) FROM base_patient p INNER JOIN " +
                " wlyy_patient_device d ON p.id = d.`user` WHERE p.sign_status = 0 AND p.del = 1  AND d.del = 0)) total";
        List<Integer> oldTotalList = jdbcTemplate.queryForList(oldTotalSql, Integer.class);
        res.put("oldTotal",oldTotalList.get(0));
        res.put("sexList", sexArray);
        return res;
    }