From c6cbf7d7a60a35f1475be90c7a920fefacca2b40 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Mon, 16 Sep 2019 16:04:46 -0400
Subject: [PATCH] Allow valdation of string values in openchoice (#81)

---
 .../fhir/r5/validation/InstanceValidator.java | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
index 1b736f392..ad0e73d87 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
@@ -3608,18 +3608,20 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
           // If it's the wrong type, just keep going
         }
       }
-      if (list.isEmpty() && !openChoice) {
-        rule(errors, IssueType.STRUCTURE, v.line(), v.col(), stack.getLiteralPath(), false, "Option list has no option values of type string");
-      } else {
-        boolean found = false;
-        for (StringType item : list) {
-          if (item.getValue().equals((v.primitiveValue()))) {
-            found = true;
-            break;
+      if (!openChoice) {
+        if (list.isEmpty()) {
+          rule(errors, IssueType.STRUCTURE, v.line(), v.col(), stack.getLiteralPath(), false, "Option list has no option values of type string");
+        } else {
+          boolean found = false;
+          for (StringType item : list) {
+            if (item.getValue().equals((v.primitiveValue()))) {
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            rule(errors, IssueType.STRUCTURE, v.line(), v.col(), stack.getLiteralPath(), found, "The string " + v.primitiveValue() + " is not a valid option");
           }
-        }
-        if (!found) {
-          rule(errors, IssueType.STRUCTURE, v.line(), v.col(), stack.getLiteralPath(), found, "The string "+v.primitiveValue()+" is not a valid option");
         }
       }
     } else {