diff --git a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/execution/Environment.java b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/execution/Environment.java index aea4c8d89..0f0db054b 100644 --- a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/execution/Environment.java +++ b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/execution/Environment.java @@ -116,6 +116,10 @@ public Object as(Object operand, Class type, boolean isStrict) { return null; } + if (Iterable.class.isAssignableFrom(type) && operand instanceof Iterable) { + return operand; + } + if (type.isAssignableFrom(operand.getClass())) { return operand; } @@ -176,6 +180,10 @@ public Boolean is(Object operand, Class type) { return null; } + if (Iterable.class.isAssignableFrom(type) && operand instanceof Iterable) { + return true; + } + if (type.isAssignableFrom(operand.getClass())) { return true; }