Merge pull request #23 from MeasureAuthoringTool/MAT-6929

MAT-6929 QDM Measure Export: Text value that is required when Improvement Notation value is "other" does not appear in HQMF
MeasureAuthoringTool · Mar 15, 2024 · d076cf3 · d076cf3
2 parents c134430 + 8c19b7d
commit d076cf3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/gov/cms/madie/services/MeasureMapper.java b/src/main/java/gov/cms/madie/services/MeasureMapper.java
@@ -90,7 +90,7 @@ public interface MeasureMapper {
   @Mapping(target = "aggregation", source = "rateAggregation")
   @Mapping(target = "rationale", source = "measure.measureMetaData.rationale")
   @Mapping(target = "recommendations", source = "measure.measureMetaData.clinicalRecommendation")
-  @Mapping(target = "improvementNotations", source = "measure.improvementNotation")
+  @Mapping(target = "improvementNotations", expression = "java(getImprovementNotations(measure))")
   @Mapping(target = "references", source = "measure.measureMetaData.references")
   @Mapping(target = "definitions", source = "measure.measureMetaData.definition")
   @Mapping(target = "guidance", source = "measure.measureMetaData.guidance")
@@ -143,6 +143,13 @@ public interface MeasureMapper {
   @Mapping(target = "uuid", source = "measureSetId")
   QualityMeasureSetType measureToQualityMeasureSet(QdmMeasure measure);
 
+  default String getImprovementNotations(QdmMeasure measure) {
+    if ("Other".equals(measure.getImprovementNotation())) {
+      return measure.getImprovementNotationOther();
+    }
+    return measure.getImprovementNotation();
+  }
+
   // measureGrouping mappings
   default MeasureGroupingType measureToMeasureGroupingType(
       QdmMeasure measure, CqlLookups cqlLookups) {

diff --git a/src/test/java/gov/cms/madie/services/MeasureMapperTest.java b/src/test/java/gov/cms/madie/services/MeasureMapperTest.java
@@ -1022,4 +1022,23 @@ void testCqlDefinitionsToFunctionsType() {
     assertThat(argumentTypes.get(0).getQdmDataType(), is(equalTo(arg1.getQdmDataType())));
     assertThat(argumentTypes.get(0).getArgumentName(), is(equalTo(arg1.getArgumentName())));
   }
+
+  @Test
+  void testGetImprovementNotationsForOther() {
+    String customNotation = "Custom improvement notation";
+    QdmMeasure measure =
+        QdmMeasure.builder()
+            .improvementNotation("Other")
+            .improvementNotationOther(customNotation)
+            .build();
+    assertThat(measureMapper.getImprovementNotations(measure), is(equalTo(customNotation)));
+  }
+
+  @Test
+  void testGetImprovementNotationsForIncreaseScore() {
+    String notation = "Increased score indicates improvement";
+    QdmMeasure measure =
+        QdmMeasure.builder().improvementNotation(notation).improvementNotationOther("").build();
+    assertThat(measureMapper.getImprovementNotations(measure), is(equalTo(notation)));
+  }
 }