|
|
@@ -124,7 +124,7 @@ public class BusInfusionHistoryController implements BaseQueryController<BusInfu
|
|
|
List<BusDeviceHistoryEntity> histories = deviceHistoryService.list(new QueryWrapper<BusDeviceHistoryEntity>()
|
|
|
.lambda()
|
|
|
.select(BusDeviceHistoryEntity::getId,BusDeviceHistoryEntity::getInfusionId,BusDeviceHistoryEntity::getDataNumber)
|
|
|
- .lt(BusDeviceHistoryEntity::getDataNumber,source.getBasicNum())
|
|
|
+ .le(BusDeviceHistoryEntity::getDataNumber,source.getBasicNum())
|
|
|
.in(BusDeviceHistoryEntity::getInfusionId, ids));
|
|
|
Map<String, List<BusDeviceHistoryEntity>> historiesMap = histories.stream()
|
|
|
.collect(Collectors.groupingBy(BusDeviceHistoryEntity::getInfusionId));
|