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

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

@@ -1855,6 +1855,9 @@ public class StatisticsService extends BaseService {
                        List<Hospital> hospitals = hospitalDao.findByTownCode(town.getCode());
                        for (Hospital hos : hospitals) {
                            if(hos.getCode().length() > 10){
                                continue;
                            }
                            Map<String, Object> obj = new HashMap<>();
                            obj.put("code", hos.getCode());
                            obj.put("name", hos.getName());
@@ -1878,6 +1881,9 @@ public class StatisticsService extends BaseService {
                if (hospitals != null && hospitals.size() > 0) {
                    for (Hospital hos : hospitals) {
                        if(hos.getCode().length() > 10){
                            continue;
                        }
                        List<AdminTeam> teams = adminTeamDao.findByOrgCode(hos.getCode());
                        for (AdminTeam team : teams) {
@@ -2509,7 +2515,7 @@ public class StatisticsService extends BaseService {
                "     quato_code = '" + index + "' " +
                "   and level1_type = '" + level + "' and del = '1' " +
                "   and quota_date >= '" + startDate + "' " +
                "   and quota_date <= '" + endDate + "' " +
                "   and quota_date <= '" + dateCon + "' " +
                "   and " + areaField + " = '" + area + "' ";
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql);
@@ -2653,7 +2659,7 @@ public class StatisticsService extends BaseService {
                Map<String, Object> manbing = new HashMap<>();
                manbing.put("code", "2");
                manbing.put("name", "慢病人群");
                manbing.put("name", "慢病人群65岁以下");
                manbing.put("amount", Double.valueOf("0.0"));
                resultList.add(manbing);