|
@ -1570,9 +1570,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
//查询出所有的设备
|
|
|
if (!org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)
|
|
|
&&!org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)) {
|
|
|
page=(page-1)*size;
|
|
|
Iterable<Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page, size);
|
|
|
List<Mediicinedevice> mediicinedeviceList = IterableUtils.toList(mediicinedevices);
|
|
|
for (Mediicinedevice mediicinedevice : mediicinedeviceList) {
|
|
|
for (Mediicinedevice mediicinedevice : mediicinedevices) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("community", mediicinedevice.getCommunity());
|
|
|
map.put("equName", mediicinedevice.getEquNum() + (mediicinedevice.getEquName() == null ? "" : "/" + mediicinedevice.getEquName()));
|