Skip to content

eRSD Transformer Enhancements for eRSD V3 #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sliver007 merged 9 commits into from
Mar 11, 2026
Merged

eRSD Transformer Enhancements for eRSD V3 #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0810a2
Various utilities for eRSD
sliver007 Mar 5, 2025
40945e5
Merge branch 'master' into fix_ersd_util_operations
sliver007 Sep 3, 2025
fab5315
Update V3 bundles
sliver007 Sep 3, 2025
462b4e3
Updates to eRSD Transformer for manifest parameters and other V3 impr…
sliver007 Mar 11, 2026
90b74f6
Merge branch 'master' into fix_ersd_util_operations
sliver007 Mar 11, 2026
5ce38ec
Updated test cases
sliver007 Mar 11, 2026
53f03f5
Remove eRSDGrouperComposeFixer
sliver007 Mar 11, 2026
6b6d6f1
Remove commented code
sliver007 Mar 11, 2026
bb08144
Created constants for frequently-used system url
sliver007 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/OperationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
import org.opencds.cqf.tooling.acceleratorkit.DTProcessor;
import org.opencds.cqf.tooling.acceleratorkit.Processor;
import org.opencds.cqf.tooling.casereporting.tes.TESPackageGenerator;
import org.opencds.cqf.tooling.casereporting.transformer.ErsdTransformer;
import org.opencds.cqf.tooling.dateroller.DataDateRollerOperation;
import org.opencds.cqf.tooling.exception.InvalidOperationArgs;
import org.opencds.cqf.tooling.exception.OperationNotFound;
import org.opencds.cqf.tooling.library.r4.LibraryGenerator;
Expand Down
488 changes: 315 additions & 173 deletions tooling/src/main/java/org/opencds/cqf/tooling/casereporting/transformer/ErsdTransformer.java
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 32 additions & 1 deletion tooling/src/main/java/org/opencds/cqf/tooling/operation/BundleToTransactionOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import ca.uhn.fhir.context.FhirVersionEnum;
import org.hl7.fhir.dstu3.model.Bundle;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.CanonicalType;
import org.hl7.fhir.r4.model.ResourceType;
import org.hl7.fhir.r4.model.ValueSet;
import org.opencds.cqf.tooling.Operation;

import java.io.*;
Expand All @@ -15,6 +18,7 @@ public class BundleToTransactionOperation extends Operation {
private String encoding; // -encoding (-e)
private String path; // -path (-p)
private String version; // -version (-v) Can be dstu2, stu3, or r4
private Boolean relativeRequestUrls; // -relativerequesturls (-rru_

private IBaseResource theResource;
private List<IBaseResource> theResources = new ArrayList<>();
Expand Down Expand Up @@ -49,6 +53,8 @@ public void execute(String[] args) {
case "version": case "v":
version = value;
break;
case "relativerequesturls": case "rru":
relativeRequestUrls = Boolean.parseBoolean(value); break; // -relativerequesturls (-rru)
default: throw new IllegalArgumentException("Unknown flag: " + flag);
}
}
Expand Down Expand Up @@ -112,7 +118,32 @@ else if (context.getVersion().getVersion() == FhirVersionEnum.R4) {
org.hl7.fhir.r4.model.Bundle bundle = (org.hl7.fhir.r4.model.Bundle)resource;
for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent entry : bundle.getEntry()) {
if (entry.getResource() != null) {
entry.setRequest(new org.hl7.fhir.r4.model.Bundle.BundleEntryRequestComponent().setUrl(entry.getResource().getId()).setMethod(org.hl7.fhir.r4.model.Bundle.HTTPVerb.PUT));
if (entry.getResource().getResourceType().compareTo(ResourceType.ValueSet) == 0) {
var valueSet = (org.hl7.fhir.r4.model.ValueSet)entry.getResource();
ValueSet.ValueSetComposeComponent compose = valueSet.getCompose();
ValueSet.ValueSetComposeComponent newCompose = new ValueSet.ValueSetComposeComponent();
List<ValueSet.ConceptSetComponent> concepts = compose.getInclude();
for (ValueSet.ConceptSetComponent concept : concepts) {
if (concept.hasValueSet()) {
List<CanonicalType> referencedValueSets = concept.getValueSet();
if (referencedValueSets.size() > 1) {

for (CanonicalType reference : referencedValueSets) {
List<CanonicalType> newInclude = new ArrayList<>();
newInclude.add(reference);
newCompose.addInclude(new ValueSet.ConceptSetComponent().setValueSet(newInclude));
}
}
}
}
valueSet.setCompose(newCompose);
}

entry.setRequest(
new org.hl7.fhir.r4.model.Bundle.BundleEntryRequestComponent()
.setUrl(entry.getResource().getResourceType() + "/" + entry.getResource().getIdPart())
.setMethod(org.hl7.fhir.r4.model.Bundle.HTTPVerb.PUT)
);
}
}
bundle.setType(org.hl7.fhir.r4.model.Bundle.BundleType.TRANSACTION);
Expand Down
Loading
Loading