Merge branch 'develop' into release/v20.2.0

Author: saquino0827

ERROR_MESSAGES.md

@@ -8,13 +8,13 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 3 : CT - Unexpected exception occurred during conversion. Please contact the Service Center for assistance via phone at 1-866-288-8292 or TTY: 1-877-715-6222, or by emailing [email protected]
 * 4 : CT - Unexpected exception occurred during encoding. Please contact the Service Center for assistance via phone at 1-866-288-8292 or TTY: 1-877-715-6222, or by emailing [email protected]
 * 5 : CT - The file is not a QRDA-III XML document. Please ensure that the submission complies with the `(Submission year's)` implementation guide. `(Implementation guide link)`
-* 6 : CT - The measure GUID `(Provided measure id)` is invalid. Please see the Table 14 of `(Submission year's)` Implementation Guide for valid measure GUIDs: https://ecqi.healthit.gov/sites/default/files/2022-CMS-QRDA-III-Eligible-Clinicians-and-EP-IG-V1.1-508.pdf#page=43
+* 6 : CT - The measure GUID `(Provided measure id)` is invalid. Please see the Table 14 of the `(Submission year's)` Implementation Guide for valid measure GUIDs: https://ecqi.healthit.gov/sites/default/files/2022-CMS-QRDA-III-Eligible-Clinicians-and-EP-IG-V1.1-508.pdf#page=43
 * 7 : CT - The measure reference results must have at least one measure. Please review the measures section of your file as it cannot be empty.
 * 8 : CT - The `(Parent element)` has `(number of aggregate counts)` aggregate count values. A single aggregate count value is required.
 * 9 : CT - Aggregate count value must be an integer
 * 11 : CT - This PI Reference and Results is missing a required Measure Performed child
 * 12 : CT - This PI Measure Performed Reference and Results requires a single Measure ID
-* 13 : CT - Denominator count must be less than or equal to Initial Population count for the measure population `(measure population id)`. Please see the Table 14 of the Implementation guide for valid measure GUIDs: https://ecqi.healthit.gov/sites/default/files/2022-CMS-QRDA-III-Eligible-Clinicians-and-EP-IG-V1.1-508.pdf#page=43
+* 13 : CT - Denominator count must be less than or equal to Initial Population count for the measure population `(measure population id)`. Please see the Table 14 of the `(Submission Year)` Implementation guide for valid measure GUIDs: https://ecqi.healthit.gov/sites/default/files/2022-CMS-QRDA-III-Eligible-Clinicians-and-EP-IG-V1.1-508.pdf#page=43
 * 14 : CT - The electronic measure id: `(Current eMeasure ID)` requires `(Number of Subpopulations required)` `(Type of Subpopulation required)`(s) but there are `(Number of Subpopulations existing)`
 * 15 : CT - PI Numerator Denominator element should have a PI Section element as a parent
 * 16 : CT - PI Numerator Denominator element does not contain a measure name ID
@@ -84,7 +84,7 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 97 : CT - `(Program name)` QRDA-III Submissions require a valid CMS EHR Certification ID (Valid Format: XX15EXXXXXXXXXX)
 * 98 : CT - The performance rate cannot have a value of 0 and must be of value Null Attribute (NA).
 * 100 : CT - More than one CMS EHR Certification ID was found. Please submit with only one CMS EHR Certification id.
-* 101 : CT - Denominator count must be equal to Initial Population count for `(Program name)` measure population `(measure population id)`.
+* 101 : CT - Denominator count must be equal to Initial Population count for `(Program name)` measure population `(measure population id)`.Please see the Table 14 of `(Submission year's)` Implementation Guide for valid measure GUIDs: https://ecqi.healthit.gov/sites/default/files/2022-CMS-QRDA-III-Eligible-Clinicians-and-EP-IG-V1.1-508.pdf#page=43
 * 102 : CT - A PI section cannot contain PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2
 * 103 : CT - PCF Submissions must have the `(PCF Measure minimum)` following measures: `(Listing of valid measure ids)`
 * 105 : CT - If multiple TINs/NPIs are submitted, each must be reported within a separate performer

commons/src/main/java/gov/cms/qpp/conversion/model/error/ProblemCode.java

@@ -29,7 +29,7 @@ public enum ProblemCode implements LocalizedProblem {
 		+ "Please ensure that the submission complies with the `(Submission year's)` implementation guide. "
 		+ "`(Implementation guide link)`", true),
 	MEASURE_GUID_MISSING(6, "The measure GUID `(Provided measure id)` is invalid. "
-		+ "Please see the Table 14 of `(Submission year's)` Implementation Guide for valid measure GUIDs: "
+		+ "Please see the Table 14 of the `(Submission year's)` Implementation Guide for valid measure GUIDs: "
 		+ DocumentationReference.MEASURE_IDS, true),
 	CHILD_MEASURE_MISSING(7, "The measure reference results must have at least one measure. "
 			+ "Please review the measures section of your file as it cannot be empty."),
@@ -41,7 +41,7 @@ public enum ProblemCode implements LocalizedProblem {
 	PI_MEASURE_PERFORMED_RNR_MEASURE_ID_NOT_SINGULAR(12, "This PI Measure Performed Reference and Results requires "
 		+ "a single Measure ID"),
 	DENOMINATOR_COUNT_INVALID(13, "Denominator count must be less than or equal to Initial Population count "
-		+ "for the measure population `(measure population id)`. Please see the Table 14 of the Implementation guide for valid measure GUIDs: "
+		+ "for the measure population `(measure population id)`. Please see the Table 14 of the `(Submission Year)` Implementation guide for valid measure GUIDs: "
 		+ DocumentationReference.MEASURE_IDS, true),
 	POPULATION_CRITERIA_COUNT_INCORRECT(14,
 			"The electronic measure id: `(Current eMeasure ID)` requires `(Number of Subpopulations required)` "
@@ -190,7 +190,9 @@ public enum ProblemCode implements LocalizedProblem {
 	PCF_MISSING_CEHRT_ID(97, "`(Program name)` QRDA-III Submissions require a valid CMS EHR Certification ID (Valid Format: XX15EXXXXXXXXXX)", true),
 	PCF_ZERO_PERFORMANCE_RATE(98, "The performance rate cannot have a value of 0 and must be of value Null Attribute (NA)."),
 	PCF_DUPLICATE_CEHRT(100, "More than one CMS EHR Certification ID was found. Please submit with only one CMS EHR Certification id."),
-	PCF_DENOMINATOR_COUNT_INVALID(101, "Denominator count must be equal to Initial Population count for `(Program name)` measure population `(measure population id)`.", true),
+	PCF_DENOMINATOR_COUNT_INVALID(101, "Denominator count must be equal to Initial Population count for `(Program name)` measure population `(measure population id)`."
+		+ "Please see the Table 14 of `(Submission year's)` Implementation Guide for valid measure GUIDs: "
+		+ DocumentationReference.MEASURE_IDS, true),
 	PI_RESTRICTED_MEASURES(102, "A PI section cannot contain PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2", false),
 	PCF_TOO_FEW_QUALITY_MEASURE_CATEGORY(103, "PCF Submissions must have the `(PCF Measure minimum)` "
 		+ "following measures: `(Listing of valid measure ids)`", true),

converter/src/main/java/gov/cms/qpp/conversion/validate/MeasureDataValidator.java

@@ -1,5 +1,6 @@
 package gov.cms.qpp.conversion.validate;
 
+import gov.cms.qpp.conversion.Context;
 import gov.cms.qpp.conversion.decode.AggregateCountDecoder;
 import gov.cms.qpp.conversion.decode.MeasureDataDecoder;
 import gov.cms.qpp.conversion.model.Node;
@@ -35,8 +36,8 @@ protected void performValidation(Node node) {
 		}
 
 		Checker checker = checkErrors(node)
-				.hasChildren(ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(populationId))
-				.childExact(ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(populationId),
+				.hasChildren(ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(populationId, Context.REPORTING_YEAR))
+				.childExact(ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(populationId, Context.REPORTING_YEAR),
 					1, TemplateId.PI_AGGREGATE_COUNT);
 
 		if (!checker.shouldShortcut()) {
@@ -46,7 +47,7 @@ protected void performValidation(Node node) {
 						DuplicationCheckHelper.calculateDuplications(child, AggregateCountDecoder.AGGREGATE_COUNT)),
 						AggregateCountDecoder.AGGREGATE_COUNT)
 					.intValue(ProblemCode.AGGREGATE_COUNT_VALUE_NOT_INTEGER, AggregateCountDecoder.AGGREGATE_COUNT)
-					.greaterThan(ProblemCode.MEASURE_DATA_VALUE_NOT_INTEGER.format(populationId), -1);
+					.greaterThan(ProblemCode.MEASURE_DATA_VALUE_NOT_INTEGER.format(populationId, Context.REPORTING_YEAR), -1);
 		}
 	}
 }

converter/src/main/java/gov/cms/qpp/conversion/validate/QualityMeasureIdValidator.java

@@ -232,7 +232,7 @@ private void validateDenominatorCount(Node denomCount, Node ipopCount, String de
 				.incompleteValidation()
 				.intValue(ProblemCode.AGGREGATE_COUNT_VALUE_NOT_INTEGER,
 						AggregateCountDecoder.AGGREGATE_COUNT)
-				.lessThanOrEqualTo(ProblemCode.DENOMINATOR_COUNT_INVALID.format(denominatorUuid),
+				.lessThanOrEqualTo(ProblemCode.DENOMINATOR_COUNT_INVALID.format(denominatorUuid, Context.REPORTING_YEAR),
 					Integer.parseInt(ipopCount.getValue(AggregateCountDecoder.AGGREGATE_COUNT)));
 	}
 
@@ -247,7 +247,7 @@ private void validateCpcDenominatorCount(Node denomCount, Node ipopCount, String
 			.incompleteValidation()
 			.intValue(ProblemCode.AGGREGATE_COUNT_VALUE_NOT_INTEGER,
 				AggregateCountDecoder.AGGREGATE_COUNT)
-			.valueIn(ProblemCode.PCF_DENOMINATOR_COUNT_INVALID.format(program, denominatorUuid), AggregateCountDecoder.AGGREGATE_COUNT,
+			.valueIn(ProblemCode.PCF_DENOMINATOR_COUNT_INVALID.format(program, denominatorUuid, Context.REPORTING_YEAR), AggregateCountDecoder.AGGREGATE_COUNT,
 				ipopCount.getValue(AggregateCountDecoder.AGGREGATE_COUNT));
 	}
 

converter/src/test/java/gov/cms/qpp/acceptance/QualityMeasureIdMultiRoundTripTest.java

@@ -1,6 +1,7 @@
 package gov.cms.qpp.acceptance;
 
 import gov.cms.qpp.acceptance.helper.MarkupManipulator;
+import gov.cms.qpp.conversion.Context;
 import gov.cms.qpp.conversion.Converter;
 import gov.cms.qpp.conversion.InputStreamSupplierSource;
 import gov.cms.qpp.conversion.PathSource;
@@ -164,7 +165,7 @@ void testRoundTripQualityMeasureIdWithDenomGreaterThanIpop() {
 		}
 
 		assertThat(details).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-				.contains(ProblemCode.DENOMINATOR_COUNT_INVALID.format("D4D2DEE7-385A-4C28-A09C-884A062A97AA"));
+				.contains(ProblemCode.DENOMINATOR_COUNT_INVALID.format("D4D2DEE7-385A-4C28-A09C-884A062A97AA", Context.REPORTING_YEAR));
 	}
 
 	@Test

converter/src/test/java/gov/cms/qpp/acceptance/QualityMeasureIdRoundTripTest.java

@@ -205,7 +205,7 @@ void testMissingPerfDenomAggregateCount() {
 
 		String populationId = "F50E5334-415D-482F-A30D-0623C082B602";
 
-		LocalizedProblem error = ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(populationId);
+		LocalizedProblem error = ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(populationId, Context.REPORTING_YEAR);
 		assertThat(details).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
 			.contains(error);
 	}

converter/src/test/java/gov/cms/qpp/conversion/validate/MeasureDataValidatorTest.java

@@ -46,7 +46,7 @@ void missingAggregateCount() {
 		List<Detail> errors = validator.validateSingleNode(testNode).getErrors();
 		assertWithMessage("missing error")
 				.that(errors).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-				.containsExactly(ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(EMPTY_POPULATION_ID));
+				.containsExactly(ProblemCode.MEASURE_PERFORMED_MISSING_AGGREGATE_COUNT.format(EMPTY_POPULATION_ID, Context.REPORTING_YEAR));
 	}
 
 	@Test
@@ -86,7 +86,7 @@ void negativeAggregateCountsFails() throws Exception {
 		List<Detail> errors = validator.validateSingleNode(testNode).getErrors();
 		assertWithMessage("missing error")
 				.that(errors).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-				.containsExactly(ProblemCode.MEASURE_DATA_VALUE_NOT_INTEGER.format(EMPTY_POPULATION_ID));
+				.containsExactly(ProblemCode.MEASURE_DATA_VALUE_NOT_INTEGER.format(EMPTY_POPULATION_ID, Context.REPORTING_YEAR));
 	}
 
 	@Test
@@ -109,7 +109,7 @@ void multipleNegativeMeasureDataTest() {
 				.that(errors).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
 				.containsAtLeast(ProblemCode.AGGREGATE_COUNT_VALUE_NOT_INTEGER,
 						ProblemCode.AGGREGATE_COUNT_VALUE_NOT_SINGULAR.format(TemplateId.MEASURE_DATA_CMS_V4.name(), 2),
-						ProblemCode.MEASURE_DATA_VALUE_NOT_INTEGER.format("58347456-D1F3-4BBB-9B35-5D42825A0AB3"));
+						ProblemCode.MEASURE_DATA_VALUE_NOT_INTEGER.format("58347456-D1F3-4BBB-9B35-5D42825A0AB3", Context.REPORTING_YEAR));
 	}
 
 	private List<Detail> getErrors(AllErrors content) {

converter/src/test/java/gov/cms/qpp/conversion/validate/QualityMeasureIdValidatorTest.java

@@ -13,6 +13,7 @@
 
 import com.google.common.collect.Lists;
 
+import gov.cms.qpp.conversion.Context;
 import gov.cms.qpp.conversion.decode.AggregateCountDecoder;
 import gov.cms.qpp.conversion.decode.ClinicalDocumentDecoder;
 import gov.cms.qpp.conversion.model.Node;
@@ -332,7 +333,7 @@ void testInternalDenomCountGreaterThanIpopCount() {
 		List<Detail> details = objectUnderTest.validateSingleNode(measureReferenceResultsNode).getErrors();
 		assertWithMessage("Must contain the correct error message.")
 				.that(details).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-				.containsExactly(ProblemCode.DENOMINATOR_COUNT_INVALID.format("375D0559-C749-4BB9-9267-81EDF447650B"));
+				.containsExactly(ProblemCode.DENOMINATOR_COUNT_INVALID.format("375D0559-C749-4BB9-9267-81EDF447650B", Context.REPORTING_YEAR));
 	}
 
 	@Test