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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -1721,12 +1721,12 @@ public class StatisticsService extends BaseService {
        sql += "   and quota_date = ? " +
                "   and " + areaField + " = ? ";
        Map<String, Object> result = null;
        List<Map<String, Object>> result = null;
        result = jdbcTemplate.queryForMap(sql, new Object[]{level, dateCon, area});
        result = jdbcTemplate.queryForList(sql, new Object[]{level, dateCon, area});
        if (result != null && result.containsKey("amount")) {
            total += (result.get("amount") == null ? 0 : Math.round(Double.valueOf(result.get("amount").toString())));
        if (result != null && result.size() > 0) {
            total += (result.get(0).get("amount") == null ? 0 : Math.round(Double.valueOf(result.get(0).get("amount").toString())));
        }
        if (endDate.compareTo(datef.format(new Date())) == 0) {

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

@@ -349,4 +349,31 @@ public class StatisticsController extends BaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 指标截止日期累积量
     *
     * @param endDate
     * @param area
     * @param level
     * @param index
     * @return
     */
    @RequestMapping("/index_all")
    @ResponseBody
    public String getIndexAll(String endDate, String area, int level, String index) {
        try {
            String[] indexes = index.split(",");
            JSONObject result = new JSONObject();
            for (String idx : indexes) {
                result.put("index_" + idx, statisticsService.getIndexTotal(endDate, area, level, idx));
            }
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
}