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

check activeOnly parameter

This commit is contained in:
Grahame Grieve 2022-09-01 22:42:16 +10:00
parent 157fd68eca
commit fd76766da7
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetExpanderSimple.java
View File

@ -427,7 +427,7 @@ public class ValueSetExpanderSimple extends ValueSetWorker implements ValueSetEx
focus.getExpansion().setTimestampElement(DateTimeType.now()); focus.getExpansion().setTimestampElement(DateTimeType.now());
focus.getExpansion().setIdentifier(Factory.createUUID()); focus.getExpansion().setIdentifier(Factory.createUUID());
for (ParametersParameterComponent p : expParams.getParameter()) { for (ParametersParameterComponent p : expParams.getParameter()) {
if (Utilities.existsInList(p.getName(), "includeDesignations", "excludeNested")) if (Utilities.existsInList(p.getName(), "includeDesignations", "excludeNested", "activeOnly"))
focus.getExpansion().addParameter().setName(p.getName()).setValue(p.getValue()); focus.getExpansion().addParameter().setName(p.getName()).setValue(p.getValue());
} }
@ -487,10 +487,24 @@ public class ValueSetExpanderSimple extends ValueSetWorker implements ValueSetEx
first = false; first = false;
else else
canBeHeirarchy = false; canBeHeirarchy = false;
includeCodes(inc, exp, expParams, canBeHeirarchy, compose.hasInactive() && !compose.getInactive(), extensions, valueSet); includeCodes(inc, exp, expParams, canBeHeirarchy, compose.hasInactive() ? !compose.getInactive() : checkNoInActiveFromParam(expParams), extensions, valueSet);
} }
} }
/**
* returns true if activeOnly = true
* @param expParams
* @return
*/
private boolean checkNoInActiveFromParam(Parameters expParams) {
for (ParametersParameterComponent p : expParams.getParameter()) {
if (p.getName().equals("activeOnly")) {
return p.getValueBooleanType().getValue();
}
}
return false;
}
private ValueSet importValueSet(String value, ValueSetExpansionComponent exp, Parameters expParams, boolean noInactive, ValueSet valueSet) throws ETooCostly, TerminologyServiceException, FileNotFoundException, IOException, FHIRFormatError { private ValueSet importValueSet(String value, ValueSetExpansionComponent exp, Parameters expParams, boolean noInactive, ValueSet valueSet) throws ETooCostly, TerminologyServiceException, FileNotFoundException, IOException, FHIRFormatError {
if (value == null) if (value == null)
throw fail("unable to find value set with no identity"); throw fail("unable to find value set with no identity");