Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -506,10 +506,19 @@ public class StatisticsService {
            }
        }
        String healthEquipmentSql = "SELECT COUNT(1) FROM wlyy_patient_device WHERE del = 0 AND (category_code = 1 OR category_code = 2)";
        Integer healthEquipmentNum = jdbcTemplate.queryForObject(healthEquipmentSql, Integer.class);
        String securityEquipmentSql = "SELECT COUNT(1) FROM wlyy_patient_device WHERE del = 0 AND category_code > 2";
        Integer securityEquipmentNum = jdbcTemplate.queryForObject(securityEquipmentSql, Integer.class);
        Integer healthEquipmentNum = 0;
        Integer securityEquipmentNum = 0;
        String equipmentSql = "SELECT count(DISTINCT device_code) c,device_type FROM wlyy_devices WHERE (device_code IS NOT NULL OR device_code <> '') GROUP BY device_type";
        List<Map<String,Object>> equipmentList = jdbcTemplate.queryForList(equipmentSql);
        for (Map<String,Object> map:equipmentList){
            Integer device_type = Integer.valueOf(map.get("device_type")+"");
            Integer c = Integer.valueOf(map.get("c")+"");
            if(device_type == 0){
                healthEquipmentNum = c;
            }else {
                securityEquipmentNum = c;
            }
        }
        sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' ";
        listtmp = jdbcTemplate.queryForList(sqltmp);