mirror of
https://github.com/hapifhir/org.hl7.fhir.core.git
synced 2025-03-02 09:29:13 +00:00
Merge pull request #811 from hapifhir/dotasek-structuremapping-evaluate-2
Use MAP_EXPRESSION instead of MAP_WHERE_EXPRESSION
This commit is contained in:
commit
51185f74ff
@ -1682,7 +1682,7 @@ public class StructureMapUtilities {
|
|||||||
ExpressionNode expr = (ExpressionNode) tgt.getUserData(MAP_EXPRESSION);
|
ExpressionNode expr = (ExpressionNode) tgt.getUserData(MAP_EXPRESSION);
|
||||||
if (expr == null) {
|
if (expr == null) {
|
||||||
expr = fpe.parse(getParamStringNoNull(vars, tgt.getParameter().get(1), tgt.toString()));
|
expr = fpe.parse(getParamStringNoNull(vars, tgt.getParameter().get(1), tgt.toString()));
|
||||||
tgt.setUserData(MAP_WHERE_EXPRESSION, expr);
|
tgt.setUserData(MAP_EXPRESSION, expr);
|
||||||
}
|
}
|
||||||
List<Base> v = fpe.evaluate(vars, null, null, tgt.getParameter().size() == 2 ? getParam(vars, tgt.getParameter().get(0)) : new BooleanType(false), expr);
|
List<Base> v = fpe.evaluate(vars, null, null, tgt.getParameter().size() == 2 ? getParam(vars, tgt.getParameter().get(0)) : new BooleanType(false), expr);
|
||||||
if (v.size() == 0)
|
if (v.size() == 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user