Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/org/BaseOrgService.java

@@ -35,7 +35,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
            sql += " and a.code = '"+orgCode+"' ";
        }
        sql += " a.code NOT IN (SELECT DISTINCT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null)";
        sql += " and a.code NOT IN (SELECT DISTINCT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null)";
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseOrgDO.class));
    }

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

@@ -1503,12 +1503,12 @@ public class StatisticsService {
             sql = "select GROUP_CONCAT(id) id,type,title,sender,sender_name senderName,\n" +
                    "receiver,receiver_name receiverName,relation_code relationCode,\n" +
                    "data,is_read isRead,create_time createTime,sender_photo\n" +
                    "from base_system_message where type=43 and del=1 receiver = '"+doctor+"'  GROUP BY relation_code order by createTime desc ";
                    "from base_system_message where type=43 and del=1 and receiver = '"+doctor+"'  GROUP BY relation_code order by createTime desc ";
        }else {
             sql = "select DISTINCT GROUP_CONCAT(sm.id) id,sm.type AS type,sm.title AS title,sm.sender AS sender,sm.sender_name AS senderName,\n" +
                    " sm.receiver AS receiver,sm.receiver_name AS receiver_name,sm.relation_code AS relationCode,\n" +
                    " sm.data AS data,sm.is_read AS isRead,sm.create_time AS createTime,sm.sender_photo AS sender_photo\n" +
                    " from base_system_message sm LEFT JOIN wlyy_patient_device pd ON sm.relation_code = pd.device_sn where sm.type=43 and sm.del=1 sm.receiver = '"+doctor+"'  ";
                    " from base_system_message sm LEFT JOIN wlyy_patient_device pd ON sm.relation_code = pd.device_sn where sm.type=43 and sm.del=1 AND sm.receiver = '"+doctor+"'  ";
            if (dc) {
                sql +=" AND pd.category_code = '"+deviceCode+"'";
@@ -1517,7 +1517,7 @@ public class StatisticsService {
                sql +=" and pd.device_name LIKE '%"+deviceName+"%'";
            }
             sql +="GROUP BY sm.relation_code order by sm.create_time desc";
             sql +=" GROUP BY sm.relation_code order by sm.create_time desc";
        }
        Long count = jdbcTemplate.queryForObject(" select count(id) from (" + sql + ")A ", Long.class);
@@ -2570,13 +2570,7 @@ public class StatisticsService {
    }
    public List<BaseServiceNews> serviceDynamics(Integer page,Integer size,String area,String level){
        if (null==page){
            page=0;
        }
        page = page>0?page-1:0;
        if(size==null||size<1){
            size = 9;
        }
        List<String> jkzlPatients = jdbcTemplate.queryForList("SELECT dict_code FROM wlyy_hospital_sys_dict WHERE dict_name LIKE '%jkzl%' ",String.class);
@@ -2596,7 +2590,7 @@ public class StatisticsService {
                baseServiceSql += " AND tm.team_code ='"+area+"'";
            }
        }
        baseServiceSql += " sn.create_time DESC LIMIT "+(page-1)*size+","+page+"";
        baseServiceSql += " ORDER BY create_time DESC  LIMIT "+(page-1)*size+","+size+"";
        List<BaseServiceNews> list = jdbcTemplate.query(baseServiceSql,new BeanPropertyRowMapper<>(BaseServiceNews.class));