Skip to content

Commit

Permalink
Merge pull request #207 from MeasureAuthoringTool/MAT-6979_updateVers…
Browse files Browse the repository at this point in the history
…ionNumberForDraftMeasures

MAT-6979 update version number for draft measures in exported bundle
  • Loading branch information
sb-cecilialiu authored May 10, 2024
2 parents 15a5f7e + da9a6cf commit 8812893
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ public org.hl7.fhir.r4.model.Measure createFhirMeasureForMadieMeasure(Measure ma
String rationale = madieMeasure.getMeasureMetaData().getRationale();
Instant approvalDate = madieMeasure.getReviewMetaData().getApprovalDate();
Instant lastReviewDate = madieMeasure.getReviewMetaData().getLastReviewDate();

String version = madieMeasure.getVersion().toString();
if (madieMeasure.getMeasureMetaData() != null && madieMeasure.getMeasureMetaData().isDraft()) {
version = "Draft based on " + version;
}
org.hl7.fhir.r4.model.Measure measure = new org.hl7.fhir.r4.model.Measure();
measure
.setName(madieMeasure.getCqlLibraryName())
Expand All @@ -62,7 +65,7 @@ public org.hl7.fhir.r4.model.Measure createFhirMeasureForMadieMeasure(Measure ma
.setExperimental(madieMeasure.getMeasureMetaData().isExperimental())
.setUrl(
FhirResourceHelpers.buildResourceFullUrl("Measure", madieMeasure.getCqlLibraryName()))
.setVersion(madieMeasure.getVersion().toString())
.setVersion(version)
.setEffectivePeriod(
getPeriodFromDates(
madieMeasure.getMeasurementPeriodStart(), madieMeasure.getMeasurementPeriodEnd()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ public void testCreateFhirMeasureForMadieMeasure() {
measure.getSupplementalData().get(2).getCriteria().getExpression());
assertEquals("Risk Adjustments example", measure.getSupplementalData().get(2).getDescription());
assertFalse(measure.getSupplementalData().get(2).getUsage().get(0).getCoding().isEmpty());
assertEquals("0.0.000", measure.getVersion());
}

@Test
Expand Down Expand Up @@ -912,4 +913,12 @@ public void testBuildScoringConceptContinuousVariable() {
assertNotNull(codeConcept);
assertEquals("continuous-variable", codeConcept.getCoding().get(0).getCode());
}

@Test
public void testCreateFhirMeasureForDraftMadieMeasure() {
madieMeasure.getMeasureMetaData().setDraft(true);
org.hl7.fhir.r4.model.Measure measure =
measureTranslatorService.createFhirMeasureForMadieMeasure(madieMeasure);
assertEquals("Draft based on 0.0.000", measure.getVersion());
}
}

0 comments on commit 8812893

Please sign in to comment.