111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/BaseServiceNewsService.java

@@ -66,7 +66,7 @@ public class BaseServiceNewsService {
            orgCodes = orgCodes.replaceAll(",","','");
            filter = " and code not in ('"+orgCodes+"')";
        }
        String sql = "SELECT code,name,brief,address,photo,mobile,longitude,latitude,type from base_org WHERE type in ('3','4','6') and del =1 " +
        String sql = "SELECT code,name,brief,address,photo,mobile,longitude,latitude,type from base_org WHERE type in ('1','2','3','4','6') and del =1 " +
                " and code not in ('zdjsylfwyxgszhfgs') ";
        sql += filter;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);

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

@@ -3166,8 +3166,14 @@ public class StatisticsService {
                        "  YEAR ( now()) - YEAR (substring( p.idcard, 7, 8 )) WHEN LENGTH( p.idcard )= 15 THEN " +
                        "  YEAR ( now()) - YEAR (STR_TO_DATE( CONCAT( '19', substring( p.idcard, 7, 2 )), '%Y' )) ELSE NULL  " +
                        " END AS age, p.mobile AS mobile, p.address AS address, t.`name` AS orgName, " +
                        " GROUP_CONCAT( DISTINCT d.NAME SEPARATOR ',' ) AS doctorName  FROM " +
                        " base_patient p,base_service_package_sign_record sr,base_service_package_record r,base_service_package_item i,base_service_package pack,base_team t,base_team_member tm,base_doctor d  " +
                        " GROUP_CONCAT( DISTINCT d.NAME SEPARATOR ',' ) AS socialWorkerName" +
                        ",GROUP_CONCAT( DISTINCT h.doctor_name SEPARATOR ',' ) AS helperName" +
                        ",GROUP_CONCAT( DISTINCT pd.doctor_name SEPARATOR ',' ) AS doctorName  " +
                        " FROM base_patient p " +
                        " left join base_patient_helper h on h.patient = p.id and h.del = '1' " +
                        " left join base_patient_doctor pd on pd.patient = p.id " +
                        ",base_service_package_sign_record sr,base_service_package_record r," +
                        " base_service_package_item i,base_service_package pack,base_team t,base_team_member tm,base_doctor d  " +
                        " WHERE " +
                        " sr.id = r.sign_id  " +
                        " AND sr.STATUS = 1  " +
@@ -3189,9 +3195,13 @@ public class StatisticsService {
                        "  WHEN LENGTH( p.idcard )= 15 THEN " +
                        "  YEAR (now()) - YEAR (STR_TO_DATE( CONCAT( '19', substring( p.idcard, 7, 2 )), '%Y' )) ELSE NULL  " +
                        " END AS age, " +
                        " p.mobile AS mobile,p.address AS address, p.residential_area AS orgName,'' AS doctorName  " +
                        " p.mobile AS mobile,p.address AS address, p.residential_area AS orgName,'' AS socialWorkerName" +
                        " ,GROUP_CONCAT( DISTINCT h.doctor_name SEPARATOR ',' ) AS helperName  " +
                        " ,GROUP_CONCAT( DISTINCT pd.doctor_name SEPARATOR ',' ) AS doctorName  " +
                        " FROM " +
                        " base_patient p INNER JOIN wlyy_patient_device d ON p.id = d.`user`  " +
                        " base_patient p INNER JOIN wlyy_patient_device d ON p.id = d.`user`" +
                        " left join base_patient_helper h on h.patient = p.id and h.del = '1' " +
                        " left join base_patient_doctor pd on pd.patient = p.id " +
                        " WHERE p.sign_status = 0 AND p.del = 1 AND d.del = 0 AND p.archive_type = 1 " + nameSql+idcardSql+orgNameSql2+
                        " <testUserSql>  " +
                        " GROUP BY p.idcard  ";