honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix evaluation of discriminators where elements may repeat

This commit is contained in:
Grahame Grieve 2019-05-22 11:12:56 +10:00
parent 86602a1bc1
commit c5ace67136
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -2743,7 +2743,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
CodeableConcept cc = (CodeableConcept) fixed;
buildCodeableConceptExpression(ed, expression, discriminator, cc);
} else {
expression.append(" and (" + discriminator + " = ");
expression.append(" and (");
if (fixed instanceof StringType) {
Gson gson = new Gson();
String json = gson.toJson((StringType)fixed);
@ -2760,7 +2760,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
expression.append(((BooleanType)fixed).asStringValue());
} else
throw new DefinitionException("Unsupported fixed value type for discriminator(" + discriminator + ") for slice " + ed.getId() + ": " + fixed.getClass().getName());
expression.append(")");
expression.append(" in " + discriminator +")");
}
}