代码修改

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

@@ -798,9 +798,16 @@ public class StatisticsService {
            if (StringUtils.isNotBlank(type)) {
                //周/月 增量
                String start = statisticsUtilService.calStart(endDate, type);
                SaveModel saveModelAdd = elasticsearchUtil.findOneDateQuotaLevel0(start, endDate, area, level, ind, SaveModel.timeLevel_ZL, areaLevel);
                res.put("index_" + ind + "_add", saveModelAdd.getResult2().longValue());
                long addNum = 0;
                if("55".equals(ind)){
                    //已关联家属老人数 增量用2个时间相减
                    SaveModel saveModelstart = elasticsearchUtil.findOneDateQuotaLevel0(start, start, area, level, ind, SaveModel.timeLevel_DDL, areaLevel);
                    addNum = saveModel.getResult2().longValue() - saveModelstart.getResult2().longValue();
                }else{
                    SaveModel saveModelAdd = elasticsearchUtil.findOneDateQuotaLevel0(start, endDate, area, level, ind, SaveModel.timeLevel_ZL, areaLevel);
                    addNum = saveModelAdd.getResult2().longValue();
                }
                res.put("index_" + ind + "_add", addNum);
            }
        }
@@ -1270,7 +1277,7 @@ public class StatisticsService {
    }
    /**
     * 管理端首页老人接入情况
     * 管理端首页老人接入情况，关联家属
     *
     * @return
     */
@@ -1289,9 +1296,32 @@ public class StatisticsService {
        sql = " select count(DISTINCT p.id) from base_patient p INNER JOIN wlyy_patient_device pd on p.id = pd.user and p.archive_type=1 and pd.del=0 where p.del=1 and p.id " + filter;
        Integer bindingCount = jdbcTemplate.queryForObject(sql, Integer.class);
        //老人接入情况
        result.put("olderCount", olderCount);
        result.put("bindingCount", bindingCount);
        result.put("range", commonUtil.getRange(bindingCount, olderCount));
        //关联家属
        String sqlfamily = "SELECT COUNT(p.id)  FROM " +
                "base_patient p INNER JOIN base_service_package_sign_record sr " +
                "on p.id = sr.patient and sr.`status`=1 and  p.id not in " +
                "(SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_child' or dict_name = 'jkzl_older') " +
                ",(SELECT DISTINCT fm.family_member from base_patient_family_member fm,base_patient p1 " +
                "WHERE p1.id = fm.patient and p1.archive_type = '3') f1 " +
                "WHERE p.del = 1 and p.archive_type =1 and p.id = f1.family_member ";
        String sqlSign = "SELECT COUNT(p.id) FROM " +
                "base_patient p INNER JOIN base_service_package_sign_record sr " +
                "on p.id = sr.patient and sr.`status`=1 and  p.id not in " +
                "(SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_child' or dict_name = 'jkzl_older') " +
                "WHERE p.del = 1 and p.archive_type =1 ";
        Integer familyOlderCount = jdbcTemplate.queryForObject(sqlfamily, Integer.class);
        Integer familySignCount = jdbcTemplate.queryForObject(sqlSign, Integer.class);
        result.put("familyOlderCount", familyOlderCount);
        result.put("familySignCount", familySignCount);
        result.put("famulyRange", commonUtil.getRange(familyOlderCount, familySignCount));
        return result;
    }