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 up VSAC import for large value sets

This commit is contained in:
Grahame Grieve 2023-11-14 11:59:29 +11:00
parent ecd62b6feb
commit b898cfe59f
4 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/VSACImporter.java
View File

@ -13,10 +13,13 @@ import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.formats.IParser.OutputStyle; import org.hl7.fhir.r4.formats.IParser.OutputStyle;
import org.hl7.fhir.r4.formats.JsonParser; import org.hl7.fhir.r4.formats.JsonParser;
import org.hl7.fhir.r4.model.CapabilityStatement; import org.hl7.fhir.r4.model.CapabilityStatement;
import org.hl7.fhir.r4.model.IntegerType;
import org.hl7.fhir.r4.model.OperationOutcome; import org.hl7.fhir.r4.model.OperationOutcome;
import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity; import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity;
import org.hl7.fhir.r4.model.OperationOutcome.IssueType; import org.hl7.fhir.r4.model.OperationOutcome.IssueType;
import org.hl7.fhir.r4.model.Parameters;
import org.hl7.fhir.r4.model.ValueSet; import org.hl7.fhir.r4.model.ValueSet;
import org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent;
import org.hl7.fhir.r4.utils.client.FHIRToolingClient; import org.hl7.fhir.r4.utils.client.FHIRToolingClient;
import org.hl7.fhir.r4.terminologies.JurisdictionUtilities; import org.hl7.fhir.r4.terminologies.JurisdictionUtilities;
import org.hl7.fhir.utilities.CSVReader; import org.hl7.fhir.utilities.CSVReader;
@ -63,6 +66,16 @@ public class VSACImporter extends OIDBasedValueSetImporter {
errs.put(oid, "Expansion: " +e.getMessage()); errs.put(oid, "Expansion: " +e.getMessage());
System.out.println(e.getMessage()); System.out.println(e.getMessage());
} }
while (isIncomplete(vs.getExpansion())) {
Parameters p = new Parameters();
p.addParameter("offset", vs.getExpansion().getParameter("offset").getValueIntegerType().getValue() + vs.getExpansion().getParameter("count").getValueIntegerType().getValue());
ValueSet vse = fhirToolingClient.expandValueset(vs.getUrl(), p);
vs.getExpansion().getContains().addAll(vse.getExpansion().getContains());
vs.getExpansion().setParameter(vse.getExpansion().getParameter());
}
vs.getExpansion().setOffsetElement(null);
vs.getExpansion().getParameter().clear();
if (vs.hasTitle()) { if (vs.hasTitle()) {
if (vs.getTitle().equals(vs.getDescription())) { if (vs.getTitle().equals(vs.getDescription())) {
@ -97,6 +110,12 @@ public class VSACImporter extends OIDBasedValueSetImporter {
System.out.println("Done. " + i + " ValueSets"); System.out.println("Done. " + i + " ValueSets");
} }
private boolean isIncomplete(ValueSetExpansionComponent expansion) {
IntegerType c = expansion.getParameter("count").getValueIntegerType();
IntegerType offset = expansion.getParameter("offset").getValueIntegerType();
return c.getValue() + offset.getValue() < expansion.getTotal();
}
private String makeValidName(String name) { private String makeValidName(String name) {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
boolean upper = true; boolean upper = true;

7
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Parameters.java
View File

@ -885,6 +885,13 @@ public class Parameters extends Resource implements IBaseParameters {
return this; return this;
} }
public Parameters addParameter(String name, int i) {
addParameter().setName(name).setValue(new IntegerType(i));
return this;
}
public Parameters addParameter(String name, String s) { public Parameters addParameter(String name, String s) {
if (s != null) if (s != null)
addParameter().setName(name).setValue(new StringType(s)); addParameter().setName(name).setValue(new StringType(s));

10
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ValueSet.java
View File

@ -3268,6 +3268,14 @@ public class ValueSet extends MetadataResource {
} }
public ValueSetExpansionParameterComponent getParameter(String name) {
for (ValueSetExpansionParameterComponent t : getParameter()) {
if (name.equals(t.getName())) {
return t;
}
}
return null;
}
} }
@Block() @Block()
@ -6241,6 +6249,8 @@ public class ValueSet extends MetadataResource {
return ResourceType.ValueSet; return ResourceType.ValueSet;
} }
/** /**
* Search parameter: <b>date</b> * Search parameter: <b>date</b>
* <p> * <p>

11
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java
View File

@ -383,6 +383,17 @@ public class FHIRToolingClient {
public ValueSet expandValueset(String vsUrl, Parameters expParams) { public ValueSet expandValueset(String vsUrl, Parameters expParams) {
Map<String, String> parameters = new HashMap<>(); Map<String, String> parameters = new HashMap<>();
parameters.put("url", vsUrl); parameters.put("url", vsUrl);
if (expParams != null) {
for (ParametersParameterComponent p : expParams.getParameter()) {
if (p.getValue() == null) {
throw new FHIRException("Non-value Parameters are not supported for parameter '"+p.getName()+"'");
} else if (p.getValue() instanceof PrimitiveType) {
parameters.put(p.getName(), p.getValue().primitiveValue());
} else {
throw new FHIRException("Complex Parameters are not supported for parameter '"+p.getName()+"'");
}
}
}
org.hl7.fhir.r4.utils.client.network.ResourceRequest<Resource> result = null; org.hl7.fhir.r4.utils.client.network.ResourceRequest<Resource> result = null;
try { try {