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 NPE validating from unknown code system when the code is in extension

This commit is contained in:
Grahame Grieve 2020-06-03 09:32:52 +10:00
parent 47c7dfd5e5
commit 14505af3b5
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java
View File

@ -134,7 +134,7 @@ public class ValueSetCheckerSimple implements ValueSetChecker {
cs = findSpecialCodeSystem(system); cs = findSpecialCodeSystem(system);
} }
if (cs == null) { if (cs == null) {
warningMessage = "Unable to resolve system "+system+" - system is not specified or implicit"; warningMessage = "Unable to resolve system "+system;
if (!inExpansion) if (!inExpansion)
throw new FHIRException(warningMessage); throw new FHIRException(warningMessage);
} }
@ -144,8 +144,12 @@ public class ValueSetCheckerSimple implements ValueSetChecker {
throw new FHIRException(warningMessage); throw new FHIRException(warningMessage);
} }
if (cs!=null) if (cs!=null) {
res = validateCode(code, cs); res = validateCode(code, cs);
} else {
// it's in the expansion, but we could find it in a code system
res = findCodeInExpansion(code);
}
} else { } else {
inExpansion = checkExpansion(code); inExpansion = checkExpansion(code);
} }
@ -175,13 +179,38 @@ public class ValueSetCheckerSimple implements ValueSetChecker {
return null; return null;
} }
boolean checkExpansion(Coding code) { private ValidationResult findCodeInExpansion(Coding code) {
if (valueset==null || !valueset.hasExpansion())
return null;
return findCodeInExpansion(code, valueset.getExpansion().getContains());
}
private ValidationResult findCodeInExpansion(Coding code, List<ValueSetExpansionContainsComponent> contains) {
for (ValueSetExpansionContainsComponent containsComponent: contains) {
if (containsComponent.getSystem().equals(code.getSystem()) && containsComponent.getCode().equals(code.getCode())) {
ConceptDefinitionComponent ccd = new ConceptDefinitionComponent();
ccd.setCode(containsComponent.getCode());
ccd.setDisplay(containsComponent.getDisplay());
ValidationResult res = new ValidationResult(ccd);
return res;
}
if (containsComponent.hasContains()) {
ValidationResult res = findCodeInExpansion(code, containsComponent.getContains());
if (res != null) {
return res;
}
}
}
return null;
}
private boolean checkExpansion(Coding code) {
if (valueset==null || !valueset.hasExpansion()) if (valueset==null || !valueset.hasExpansion())
return false; return false;
return checkExpansion(code, valueset.getExpansion().getContains()); return checkExpansion(code, valueset.getExpansion().getContains());
} }
boolean checkExpansion(Coding code, List<ValueSetExpansionContainsComponent> contains) { private boolean checkExpansion(Coding code, List<ValueSetExpansionContainsComponent> contains) {
for (ValueSetExpansionContainsComponent containsComponent: contains) { for (ValueSetExpansionContainsComponent containsComponent: contains) {
if (containsComponent.getSystem().equals(code.getSystem()) && containsComponent.getCode().equals(code.getCode())) if (containsComponent.getSystem().equals(code.getSystem()) && containsComponent.getCode().equals(code.getCode()))
return true; return true;