|
@@ -483,9 +483,18 @@ public class TransfusionConfigFacade {
|
|
|
List<String> uniqueNames = respDTO.data;
|
|
|
if (ListUtil.isNotEmpty(originList)) {
|
|
|
for (TransfusionConfig originItem : originList) {
|
|
|
- if (allMap.containsKey(originItem.getHisName())
|
|
|
- && uniqueNames.contains(allMap.containsKey(originItem.getHisName()))) {
|
|
|
- retList.addAll(allMap.get(originItem.getHisName()));
|
|
|
+ if (allMap.containsKey(originItem.getHisName())) {
|
|
|
+ List<TransfusionConfig> items = allMap.get(originItem.getHisName());
|
|
|
+ boolean flag = false;
|
|
|
+ for (TransfusionConfig item : items) {
|
|
|
+ if (uniqueNames.contains(item.getUniqueName())) {
|
|
|
+ retList.add(item);
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!flag) {
|
|
|
+ retList.add(originItem);
|
|
|
+ }
|
|
|
} else {
|
|
|
retList.add(originItem);
|
|
|
}
|