Skip to content

Update $release to ensure direct-reference codes from cqfm & crmi edrs are handled #668

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 1 commit into from
May 30, 2025
Merged

Update $release to ensure direct-reference codes from cqfm & crmi edrs are handled #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/visitor/r4/ReleaseVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.hl7.fhir.r4.model.Basic;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
import org.hl7.fhir.r4.model.CanonicalType;
import org.hl7.fhir.r4.model.Extension;
import org.hl7.fhir.r4.model.Library;
import org.hl7.fhir.r4.model.Measure;
Expand Down Expand Up @@ -163,11 +164,17 @@ public static List<BundleEntryComponent> findArtifactCommentsToUpdate(

public static void extractDirectReferenceCodes(IKnowledgeArtifactAdapter rootAdapter, Measure measure) {
Optional<Extension> effectiveDataRequirementsExt = measure.getExtension().stream()
.filter(ext -> ext.getUrl().equals(Constants.CQFM_EFFECTIVE_DATA_REQUIREMENTS))
.filter(ext -> ext.getUrl().equals(Constants.CQFM_EFFECTIVE_DATA_REQUIREMENTS)
|| ext.getUrl().equals(Constants.CRMI_EFFECTIVE_DATA_REQUIREMENTS))
.findFirst();
if (effectiveDataRequirementsExt.isPresent()) {
Reference ref = (Reference) effectiveDataRequirementsExt.get().getValue();
Library effectiveDataRequirementsLib = (Library) measure.getContained("#" + ref.getReference());
Library effectiveDataRequirementsLib = null;
if (effectiveDataRequirementsExt.get().getValue() instanceof Reference ref) {
effectiveDataRequirementsLib = (Library) measure.getContained("#" + ref.getReference());
} else if (effectiveDataRequirementsExt.get().getValue() instanceof CanonicalType canonicalType) {
effectiveDataRequirementsLib = (Library) measure.getContained("#" + canonicalType.asStringValue());
}

if (effectiveDataRequirementsLib != null) {
effectiveDataRequirementsLib.getExtension().stream()
.filter(ext -> ext.getUrl().equals(Constants.CQFM_DIRECT_REFERENCE_EXTENSION))
Expand Down
12 changes: 9 additions & 3 deletions cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/visitor/r5/ReleaseVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.hl7.fhir.r5.model.ArtifactAssessment;
import org.hl7.fhir.r5.model.Bundle;
import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
import org.hl7.fhir.r5.model.CanonicalType;
import org.hl7.fhir.r5.model.Extension;
import org.hl7.fhir.r5.model.Library;
import org.hl7.fhir.r5.model.Measure;
Expand Down Expand Up @@ -150,11 +151,16 @@ public static List<BundleEntryComponent> findArtifactCommentsToUpdate(

public static void extractDirectReferenceCodes(IKnowledgeArtifactAdapter rootAdapter, Measure measure) {
Optional<Extension> effectiveDataRequirementsExt = measure.getExtension().stream()
.filter(ext -> ext.getUrl().equals(Constants.CQFM_EFFECTIVE_DATA_REQUIREMENTS))
.filter(ext -> ext.getUrl().equals(Constants.CQFM_EFFECTIVE_DATA_REQUIREMENTS)
|| ext.getUrl().equals(Constants.CRMI_EFFECTIVE_DATA_REQUIREMENTS))
.findFirst();
if (effectiveDataRequirementsExt.isPresent()) {
Reference ref = effectiveDataRequirementsExt.get().getValueReference();
Library effectiveDataRequirementsLib = (Library) measure.getContained("#" + ref.getReference());
Library effectiveDataRequirementsLib = null;
if (effectiveDataRequirementsExt.get().getValue() instanceof Reference ref) {
effectiveDataRequirementsLib = (Library) measure.getContained("#" + ref.getReference());
} else if (effectiveDataRequirementsExt.get().getValue() instanceof CanonicalType canonicalType) {
effectiveDataRequirementsLib = (Library) measure.getContained("#" + canonicalType.getCanonical());
}
if (effectiveDataRequirementsLib != null) {
effectiveDataRequirementsLib.getExtension().stream()
.filter(ext -> ext.getUrl().equals(Constants.CQF_DIRECT_REFERENCE_EXTENSION))
Expand Down
4 changes: 0 additions & 4 deletions cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/visitor/r4/ReleaseVisitorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,6 @@ void measureDirectReferenceCodesIncludedInReleaseTest() {
Parameters params = new Parameters();
params.addParameter("version", "1.0.0");
params.addParameter("versionBehavior", new CodeType("default"));
var crmiEDRId = "exp-params-crmi-test";
var crmiEDRExtension = new Extension();
crmiEDRExtension.setUrl(Constants.CRMI_EFFECTIVE_DATA_REQUIREMENTS);
crmiEDRExtension.setValue(new CanonicalType("#" + crmiEDRId));
ReleaseVisitor releaseVisitor = new ReleaseVisitor(repo);
// Approval date is required to release an artifact
library.setApprovalDateElement(new DateType("2024-04-23"));
Expand Down
4 changes: 0 additions & 4 deletions cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/visitor/r5/ReleaseVisitorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,6 @@ void measureDirectReferenceCodesIncludedInReleaseTest() {
Parameters params = new Parameters();
params.addParameter("version", "1.0.0");
params.addParameter("versionBehavior", new CodeType("default"));
var crmiEDRId = "exp-params-crmi-test";
var crmiEDRExtension = new Extension();
crmiEDRExtension.setUrl(Constants.CRMI_EFFECTIVE_DATA_REQUIREMENTS);
crmiEDRExtension.setValue(new CanonicalType("#" + crmiEDRId));
ReleaseVisitor releaseVisitor = new ReleaseVisitor(repo);
// Approval date is required to release an artifact
library.setApprovalDateElement(new DateType("2024-04-23"));
Expand Down
6 changes: 2 additions & 4 deletions ...test/resources/org/opencds/cqf/fhir/cr/visitor/r4/Bundle-ecqm-qicore-2024-simplified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3841,10 +3841,8 @@
"extension": [
{
"id": "effective-data-requirements",
"url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-effectiveDataRequirements",
"valueReference": {
"reference": "#effective-data-requirements"
}
"url": "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-effectiveDataRequirements",
"valueCanonical": "#effective-data-requirements"
},
{
"url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-softwaresystem",
Expand Down
6 changes: 2 additions & 4 deletions ...test/resources/org/opencds/cqf/fhir/cr/visitor/r5/Bundle-ecqm-qicore-2024-simplified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3841,10 +3841,8 @@
"extension": [
{
"id": "effective-data-requirements",
"url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-effectiveDataRequirements",
"valueReference": {
"reference": "#effective-data-requirements"
}
"url": "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-effectiveDataRequirements",
"valueCanonical": "#effective-data-requirements"
},
{
"url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-softwaresystem",
Expand Down