|
|
@@ -521,7 +521,7 @@ public class DailyExpensesServiceImpl implements DailyExpensesService {
|
|
|
public List<DailyExpensesDO> getMedicalDailyExpenses(DailyMedicalExpensesReqVO reqVO) {
|
|
|
reqVO.setItemCategory("增值服务费");
|
|
|
List<DailyExpensesDO> list = dailyExpensesMapper.getMedicalDailyExpenses(reqVO);
|
|
|
- list = list.stream().filter(e->(!e.getItemCategory().contains("电器管理费") || !e.getItemCategory().contains("洗衣费"))).collect(Collectors.toList());
|
|
|
+ list = list.stream().filter(e->(!e.getItemCategory().contains("电器管理费") || !e.getItemCategory().contains("洗衣费") || !e.getItemCategory().contains("电费"))).collect(Collectors.toList());
|
|
|
HashMap<Long, List<DailyExpensesDO>> elderItemMap = new HashMap<>();
|
|
|
for (DailyExpensesDO dailyExpensesDO : list) {
|
|
|
List<DailyExpensesDO> dailyExpensesDOS = elderItemMap.computeIfAbsent(dailyExpensesDO.getElderId(), k -> new ArrayList<>());
|