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

Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core

This commit is contained in:
Grahame Grieve 2020-02-07 10:30:38 +11:00
parent c0976dd365 076ee562e3
commit ff9bc8ec9c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1720,7 +1720,11 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
ok = true;
break;
}
sd = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition());
if (sd.getBaseDefinition() != null) {
sd = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition());
} else {
sd = null;
}
}
}
}
@ -4715,9 +4719,6 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
// time = System.nanoTime();
// check type invariants
if (definition.getId().equals("Composition.section:sectionResults")) {
System.out.println("!");
}
checkInvariants(hostContext, errors, profile, definition, resource, element, stack, false);
if (definition.getFixed() != null)
checkFixedValue(errors, stack.getLiteralPath(), element, definition.getFixed(), profile.getUrl(), definition.getSliceName(), null);