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 value set validation to deal with multi-heirarchy

This commit is contained in:
Grahame Grieve 2020-08-16 06:48:06 +10:00
parent 7771c7f231
commit cbf70365f1
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,12 +369,33 @@ public class ValueSetCheckerSimple implements ValueSetChecker {
}
return true;
}
private ConceptDefinitionComponent findCodeInConcept(ConceptDefinitionComponent concept, String code) {
if (code.equals(concept.getCode())) {
return concept;
}
ConceptDefinitionComponent cc = findCodeInConcept(concept.getConcept(), code);
if (cc != null) {
return cc;
}
if (concept.hasUserData(CodeSystemUtilities.USER_DATA_CROSS_LINK)) {
List<ConceptDefinitionComponent> children = (List<ConceptDefinitionComponent>) concept.getUserData(CodeSystemUtilities.USER_DATA_CROSS_LINK);
for (ConceptDefinitionComponent c : children) {
cc = findCodeInConcept(c, code);
if (cc != null) {
return cc;
}
}
}
return null;
}
private ConceptDefinitionComponent findCodeInConcept(List<ConceptDefinitionComponent> concept, String code) {
for (ConceptDefinitionComponent cc : concept) {
if (code.equals(cc.getCode())) {
return cc;
}
ConceptDefinitionComponent c = findCodeInConcept(cc.getConcept(), code);
ConceptDefinitionComponent c = findCodeInConcept(cc, code);
if (c != null) {
return c;
}
@ -449,7 +470,7 @@ public class ValueSetCheckerSimple implements ValueSetChecker {
Boolean nok = inComponent(vsi, system, code, valueset.getCompose().getInclude().size() == 1);
if (nok == null && result == false) {
result = null;
} else if (!nok) {
} else if (nok) {
result = false;
}
}
@ -547,7 +568,7 @@ public class ValueSetCheckerSimple implements ValueSetChecker {
if (cc == null) {
return false;
}
cc = findCodeInConcept(cc.getConcept(), code);
cc = findCodeInConcept(cc, code);
return cc != null;
}