|
@@ -700,11 +700,18 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
.filter(i -> i.getIsMatch() != null
|
|
|
&& i.getIsMatch().equals(1)
|
|
|
&& i.getSource() != null
|
|
|
- && (i.getSource().equals(MatchSourceEnum.StandWord.getKey())
|
|
|
- || i.getSource().equals(MatchSourceEnum.SynonymsWord.getKey())))
|
|
|
+ && (i.getSource().equals(MatchSourceEnum.StandWord.getKey())))
|
|
|
.map(MappingConfigWrapper::getHisName)
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
+ hisDrugNames.addAll(historyList.stream()
|
|
|
+ .filter(i -> i.getIsMatch() != null
|
|
|
+ && i.getIsMatch().equals(1)
|
|
|
+ && i.getSource() != null
|
|
|
+ && i.getSource().equals(MatchSourceEnum.SynonymsWord.getKey()))
|
|
|
+ .map(MappingConfigWrapper::getUniqueName)
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList()));
|
|
|
if (ListUtil.isNotEmpty(hisDrugNames)) {
|
|
|
Map<String, Map<String, Map<String, List<String>>>> configMap = groupByHisNameWithName(hisDrugNames, type, null);
|
|
|
for (MappingConfigWrapper item : historyList) {
|