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/device/PatientDeviceService.java

@@ -1186,9 +1186,8 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
        }
        if (StringUtils.isNotBlank(day)){
            sql +=" and create_time>='"+day+" 00:00:00' and create_time<'"+day+" 23:59:59' ";
        }else   {
            sql +=" order by create_time desc ";
        }
        sql +=" order by create_time desc ";
        sql +=" limit 1 ";
        List<BasePatientStepDo> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BasePatientStepDo.class));
        if (list.size()>0){

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

@@ -158,11 +158,11 @@ public class StatisticsService {
        // activity-1   活动浏览次数
        // activity-2   公艺课程播放
        String sql = " select type,num from base_child_activity_click where type in(1,2)";
        String sql = " SELECT activity_type, COUNT(id) FROM base_activity_click WHERE activity_type IN (1, 2) GROUP BY activity_type";
        List<Map<String, Object>> lists = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> tmp : lists) {
            Integer num = Integer.parseInt(tmp.get("num").toString());
            res.put("activity_" + tmp.get("type").toString(), num);
            Integer num = Integer.parseInt(tmp.get("id").toString());
            res.put("activity_" + tmp.get("activity_type").toString(), num);
        }
        //activity-3 幼儿活动报名-总数
@@ -289,11 +289,11 @@ public class StatisticsService {
            // activity-1   活动浏览次数
            // activity-2   公艺课程播放
            String sql = " select type,num from base_child_activity_click where type in(1,2)";
            String sql = " SELECT activity_type, COUNT(id) FROM base_activity_click WHERE activity_type IN (1, 2) GROUP BY activity_type";
            List<Map<String, Object>> lists = jdbcTemplate.queryForList(sql);
            for (Map<String, Object> tmp : lists) {
                Integer num = Integer.parseInt(tmp.get("num").toString());
                res.put("activity_" + tmp.get("type").toString(), num);
                Integer num = Integer.parseInt(tmp.get("id").toString());
                res.put("activity_" + tmp.get("activity_type").toString(), num);
            }
            /*幼儿活动报名 总数*/