From a9814529575e2d7623e2133787cd411c9e2734a0 Mon Sep 17 00:00:00 2001 From: Matti Uusitalo Date: Tue, 20 Nov 2018 14:04:31 +0200 Subject: [PATCH] Reverted to original version --- .../validation/QuestionnaireResponseValidator.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java index 054bd549b5f..ef430b4d3ef 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java @@ -55,17 +55,6 @@ public class QuestionnaireResponseValidator extends BaseValidator { */ private IWorkerContext myWorkerCtx; - - // this is here not to introduce enabledWhen validation unless wanted - private boolean skipEnabledCheck = true; - - public boolean isSkipEnabledCheck() { - return skipEnabledCheck; - } - - public void setSkipEnabledCheck(boolean skipEnabledCheck) { - this.skipEnabledCheck = skipEnabledCheck; - } public QuestionnaireResponseValidator(IWorkerContext theWorkerCtx) { this.myWorkerCtx = theWorkerCtx; @@ -227,14 +216,12 @@ public class QuestionnaireResponseValidator extends BaseValidator { List responseItems = findResponsesByLinkId(theResponseItems, linkId); if (responseItems.isEmpty()) { if (nextQuestionnaireItem.getRequired()) { - if ((skipEnabledCheck /*|| myEnableWhenEvaluator.isQuestionEnabled(nextQuestionnaireItem, theResponseItems)*/) && nextQuestionnaireItem.getRequired() ) { if (theValidateRequired) { rule(theErrors, IssueType.BUSINESSRULE, thePathStack, false, "Missing required {0} with linkId[{1}]", itemType, linkId); } else { hint(theErrors, IssueType.BUSINESSRULE, thePathStack, false, "Missing required {0} with linkId[{1}]", itemType, linkId); } } - } continue; } if (responseItems.size() > 1) {