chenjiasheng преди 3 години
родител
ревизия
4b9017ac7f
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@ -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()));