|
@@ -13,7 +13,6 @@ import java.util.HashMap;
|
|
|
import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Description:
|
|
@@ -60,25 +59,16 @@ public class PacsConfigFacade extends PacsConfigServiceImpl{
|
|
|
List<PacsConfig> pacsConfigList = this.list(pacsConfigQueryWrapper);
|
|
|
pacsMap = EntityUtil.makeEntityListMap(pacsConfigList, "mealName");
|
|
|
for (Map.Entry<String, List<PacsConfig>> entry : pacsMap.entrySet()) {
|
|
|
- map.put(entry.getKey(), entry.getValue()
|
|
|
- .stream()
|
|
|
- .map(pacsConfig -> pacsConfig.getUniqueName())
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList()));
|
|
|
+ map.put(entry.getKey(), EntityUtil.makeListByFieldName(entry.getValue(), "uniqueName"));
|
|
|
}
|
|
|
} else if (ListUtil.isNotEmpty(pacsConfigVO.getUniqueNameList())) {
|
|
|
pacsConfigQueryWrapper.in("unique_name", pacsConfigVO.getUniqueNameList());
|
|
|
List<PacsConfig> pacsConfigList = this.list(pacsConfigQueryWrapper);
|
|
|
pacsMap = EntityUtil.makeEntityListMap(pacsConfigList, "uniqueName");
|
|
|
for (Map.Entry<String, List<PacsConfig>> entry : pacsMap.entrySet()) {
|
|
|
- map.put(entry.getKey(), entry.getValue()
|
|
|
- .stream()
|
|
|
- .map(pacsConfig -> pacsConfig.getMealName())
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList()));
|
|
|
+ map.put(entry.getKey(), EntityUtil.makeListByFieldName(entry.getValue(), "mealName"));
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
return map;
|
|
|
}
|
|
|
|