diff --git a/pom.xml b/pom.xml index c2e0c3a..a9ec1fd 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ gov.cms.madie madie-java-models - 0.6.77-SNAPSHOT + 0.6.81-SNAPSHOT com.jayway.jsonpath diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/HumanReadableService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/HumanReadableService.java index 6570927..b3afe32 100644 --- a/src/main/java/gov/cms/madie/madiefhirservice/services/HumanReadableService.java +++ b/src/main/java/gov/cms/madie/madiefhirservice/services/HumanReadableService.java @@ -41,7 +41,6 @@ private String escapeStr(String val) { private void escapeTopLevelProperties(org.hl7.fhir.r5.model.Measure measure) { measure.setPublisher(escapeStr(measure.getPublisher())); measure.setDescription(escapeStr(measure.getDescription())); - measure.setPurpose(escapeStr(measure.getPurpose())); measure.setUsage(escapeStr(measure.getUsage())); measure.setCopyright(escapeStr(measure.getCopyright())); measure.setDisclaimer(escapeStr(measure.getDisclaimer())); @@ -49,6 +48,7 @@ private void escapeTopLevelProperties(org.hl7.fhir.r5.model.Measure measure) { measure.setClinicalRecommendationStatement( escapeStr(measure.getClinicalRecommendationStatement())); measure.setRationale(escapeStr(measure.getRationale())); + measure.setPurpose(escapeStr(measure.getPurpose())); measure.setSubtitle(escapeStr(measure.getSubtitle())); measure.setRiskAdjustment(escapeStr(measure.getRiskAdjustment())); measure.setRateAggregation(escapeStr(measure.getRateAggregation())); diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java index 0e2c4b3..d100cff 100644 --- a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java +++ b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java @@ -74,12 +74,12 @@ public org.hl7.fhir.r4.model.Measure createFhirMeasureForMadieMeasure(Measure ma .setCopyright(StringUtils.isBlank(copyright) ? UNKNOWN : copyright) .setDisclaimer(StringUtils.isBlank(disclaimer) ? UNKNOWN : disclaimer) .setRationale(rationale) + .setPurpose(madieMeasure.getMeasureMetaData().getPurpose()) .setLibrary( Collections.singletonList( new CanonicalType( FhirResourceHelpers.buildResourceFullUrl( "Library", madieMeasure.getCqlLibraryName())))) - .setPurpose(UNKNOWN) .setContact(buildContactDetail(madieMeasure.getMeasureMetaData().getSteward(), false)) .setGroup(buildGroups(madieMeasure.getGroups())) .setSupplementalData(buildSupplementalData(madieMeasure)) diff --git a/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java b/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java index e0eefba..7ed0f0f 100644 --- a/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java +++ b/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java @@ -86,6 +86,7 @@ public void testCreateFhirMeasureForMadieMeasure() { assertThat(measure.getGuidance(), is(equalTo(madieMeasure.getMeasureMetaData().getGuidance()))); assertThat( measure.getRationale(), is(equalTo(madieMeasure.getMeasureMetaData().getRationale()))); + assertThat(measure.getPurpose(), is(equalTo(madieMeasure.getMeasureMetaData().getPurpose()))); assertThat(measure.getPublisher(), is(equalTo("UNKNOWN"))); assertThat( measure.getUrl(), is(equalTo("madie.cms.gov/Measure/" + madieMeasure.getCqlLibraryName()))); @@ -424,6 +425,7 @@ public void testCreateFhirMeasureForMadieRatioMeasure() { assertThat(measure.getGuidance(), is(equalTo(madieMeasure.getMeasureMetaData().getGuidance()))); assertThat( measure.getRationale(), is(equalTo(madieMeasure.getMeasureMetaData().getRationale()))); + assertThat(measure.getPurpose(), is(equalTo(null))); assertThat(measure.getPublisher(), is(equalTo("testSteward"))); assertThat(measure.getContact(), is(notNullValue())); assertThat(measure.getContactFirstRep(), is(notNullValue())); @@ -560,6 +562,7 @@ public void testCreateFhirMeasureForMadieCVMeasure() { is(equalTo(madieCVMeasure.getMeasureMetaData().getSteward().getName()))); assertThat( measure.getRationale(), is(equalTo(madieCVMeasure.getMeasureMetaData().getRationale()))); + assertThat(measure.getPurpose(), is(equalTo(null))); assertThat( measure.getUrl(), is(equalTo("madie.cms.gov/Measure/" + madieCVMeasure.getCqlLibraryName()))); diff --git a/src/test/resources/measures/madie_measure.json b/src/test/resources/measures/madie_measure.json index d681f67..44267f9 100644 --- a/src/test/resources/measures/madie_measure.json +++ b/src/test/resources/measures/madie_measure.json @@ -261,6 +261,7 @@ "copyright":null, "disclaimer":null, "rationale":null, + "purpose": "Purpose", "developers":[{ "id": "testId","name": "testDeveloper", "url": "test-developer-url.com" }], "guidance":"test guidance", "clinicalRecommendation": "testClinical", diff --git a/src/test/resources/measures/madie_ratio_measure.json b/src/test/resources/measures/madie_ratio_measure.json index 8c0fe5f..06ddc06 100644 --- a/src/test/resources/measures/madie_ratio_measure.json +++ b/src/test/resources/measures/madie_ratio_measure.json @@ -77,7 +77,8 @@ "developers":[{ "name": "testDeveloper", "url": "test-developer-url.com" }], "guidance":"test guidance", "clinicalRecommendation": "testClinical", - "experimental": "false" + "experimental": "false", + "purpose": null }, "reviewMetaData" : { "approvalDate" : "2023-01-13T16:21:27.014+0000",