|
@ -219,16 +219,16 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
filter += " and (l.equ_num like '%"+name+"%' or d1.community like '%"+name+"%'or d2.community like '%"+name+"%')";
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(orgCode)){
|
|
|
filter += " l.org_code='"+orgCode+"' ";
|
|
|
filter += " and l.org_code='"+orgCode+"' ";
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(methodType)){
|
|
|
filter += " l.method_type='"+methodType+"' ";
|
|
|
filter += " and l.method_type='"+methodType+"' ";
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(startTime)){
|
|
|
filter += " l.create_time>='"+startTime+"' ";
|
|
|
filter += " and l.create_time>='"+startTime+"' ";
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(endTime)){
|
|
|
filter += " l.create_time<='"+endTime+" 23:59:59' ";
|
|
|
filter += " and l.create_time<='"+endTime+" 23:59:59' ";
|
|
|
}
|
|
|
|
|
|
String orderBy = " order by l.id desc limit "+(page-1)*size+","+size;
|