Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into test

cdssman-service/src/main/java/com/diagbot/facade/MedRuleConvertFacade.java

@@ -749,7 +749,9 @@ public class MedRuleConvertFacade {
                 .distinct()
                 .collect(Collectors.toList());
         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()
                 .collect(Collectors.toMap(k -> k.getId(), v -> v.getConceptId() + "_"
                         + v.getType() + "_"