|
|
@ -244,7 +244,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
",if(i.fault_state='1','故障',if(i.fault_state='0','正常','')) faultStateNam,if(i.cargo_state='1','开启',if(i.cargo_state='0','关闭','')) cargoStateName" +
|
|
|
",if(i.shelf_status='1','上架',if(i.shelf_status='0','下架','')) shelfStatusName,d.delivery_address deliveryAddress " +
|
|
|
",DATE_FORMAT(i.update_time,'%Y-%m-%d %H:%i:%S') updateTime";
|
|
|
String countSql = "select count(id) ";
|
|
|
String countSql = "select count(i.id) ";
|
|
|
String filter = " from t_mediicinecabinet_inventory i,t_mediicine_device d " +
|
|
|
" where i.id_device='"+idDevice+"' and i.id_device=d.id ";
|
|
|
if(!StringUtils.isEmpty(startTime)){
|
