|
|
@ -2557,7 +2557,8 @@ public class StatisticsService {
|
|
|
|
|
|
List<BaseServiceNews> result = new ArrayList<>();
|
|
|
String olderFilter = roleService.getOlderRoleSQL(area,level);
|
|
|
String baseServiceSql = "select sn.* from base_service_news sn where sn.user_type = 1 " + olderFilter.replace("{patient}","sn.code");
|
|
|
String baseServiceSql = "select sn.* from base_service_news sn where sn.user_type = 1 and (relation_code <> '' or relation_code is not null )" + olderFilter.replace("{patient}","sn.code");
|
|
|
|
|
|
/*if ("330100".equals(area)){
|
|
|
baseServiceSql +=" UNION SELECT sn.* FROM base_service_news sn WHERE sn.user_type =2 ";
|
|
|
}else {
|
|
|
@ -2599,8 +2600,12 @@ public class StatisticsService {
|
|
|
tmp.setServeItems(serviceItems.get(0));
|
|
|
}
|
|
|
}
|
|
|
if ("5".equals(tmp.getType())){
|
|
|
String sql = "";
|
|
|
if ("6".equals(tmp.getType())){//安防
|
|
|
String sql = "SELECT serve_desc FROM base_security_monitoring_order WHERE id = '"+relationCode+"'";
|
|
|
List<String> serviceItems = jdbcTemplate.queryForList(sql,String.class);
|
|
|
if (serviceItems.size()>0){
|
|
|
tmp.setServeItems(serviceItems.get(0));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
result.add(tmp);
|
