|
@@ -749,7 +749,9 @@ public class MedRuleConvertFacade {
|
|
.distinct()
|
|
.distinct()
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
List<KlRuleBase> ruleBaseList = klRuleBaseFacade.list(new QueryWrapper<KlRuleBase>()
|
|
List<KlRuleBase> ruleBaseList = klRuleBaseFacade.list(new QueryWrapper<KlRuleBase>()
|
|
- .in("id", ruleBaseIds));
|
|
|
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
+ .eq("status", StatusEnum.Enable.getKey()));
|
|
|
|
+ //.in("id", ruleBaseIds));
|
|
Map<Long, String> ruleBaseMap = ruleBaseList.stream()
|
|
Map<Long, String> ruleBaseMap = ruleBaseList.stream()
|
|
.collect(Collectors.toMap(k -> k.getId(), v -> v.getConceptId() + "_"
|
|
.collect(Collectors.toMap(k -> k.getId(), v -> v.getConceptId() + "_"
|
|
+ v.getType() + "_"
|
|
+ v.getType() + "_"
|