|
@@ -249,7 +249,18 @@ public class UnUsedMappingFacade {
|
|
|
return retMap;
|
|
|
}
|
|
|
List<String> medRegNames = items.stream().map(i -> i.getName()).distinct().collect(Collectors.toList());
|
|
|
- retMap.put("drug", medRegNames);
|
|
|
+ List<String> medNames = Lists.newLinkedList();
|
|
|
+
|
|
|
+ List<MedNameRegName> medNameRegNames = medicineRepository.findCustomByNameAndRegName(StatusEnum.Enable.getKey());
|
|
|
+ Map<String, List<MedNameRegName>> medNameRegNameMap
|
|
|
+ = EntityUtil.makeEntityListMap(medNameRegNames, "medRegName");
|
|
|
+ for (String regName : medRegNames) {
|
|
|
+ if (medNameRegNameMap.containsKey(regName)) {
|
|
|
+ medNames.addAll(medNameRegNameMap.get(regName).stream().map(i -> i.getMedName()).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ retMap.put("drug", medNames);
|
|
|
return retMap;
|
|
|
}
|
|
|
|