diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java index 6e840f0a9b1..26d63b8a936 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java @@ -46,7 +46,6 @@ public class DefaultEnableWhenEvaluator implements IEnableWhenEvaluator { protected EnableWhenResult evaluateCondition(QuestionnaireItemEnableWhenComponent enableCondition, Element questionnaireResponse, String linkId) { - //TODO: Fix EnableWhenResult stuff List answerItems = findQuestionAnswers(questionnaireResponse, enableCondition.getQuestion()); QuestionnaireItemOperator operator = enableCondition.getOperator(); @@ -157,7 +156,7 @@ public class DefaultEnableWhenEvaluator implements IEnableWhenEvaluator { return true; } private List findSubItems(Element item) { - List results = item.getChildren(LINKID_ELEMENT) + List results = item.getChildren(ITEM_ELEMENT) .stream() .flatMap(i -> findSubItems(i).stream()) .collect(Collectors.toList());