|
@ -2079,6 +2079,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
filter += " and EXISTS (select 1 from wlyy_patient_safe_area sf where sf.patient = p.id and sf.del=1 and sf.manage_status=1) ";
|
|
|
}
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter);
|
|
|
result.put("total",list.size());
|
|
|
if (1 == detail){//获取详情
|
|
|
JSONArray monitorInfos = new JSONArray();
|
|
|
page = page>0?page-1:0;
|
|
@ -2090,7 +2091,6 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
}
|
|
|
Integer currentIndexFrom = page*pageSize;
|
|
|
Integer currentIndexEnd = page*pageSize+pageSize;
|
|
|
result.put("total",list.size());
|
|
|
result.put("totalPage",totalPage);
|
|
|
result.put("currentPage",page+1);
|
|
|
for (int i=currentIndexFrom;i<list.size()&&i<currentIndexEnd;i++){
|