Merge pull request #1036 from CMSgov/feature/QPPSF-7324_cpc-validation-updates

QPPSF-7324: Cpc Validation Updates

Author: saquino0827

ERROR_MESSAGES.md

@@ -14,7 +14,7 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 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 a measure that is a proportion measure
+* 13 : CT - Denominator count must be equal to Initial Population count for a measure that is a proportion measure
 * 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
@@ -82,3 +82,7 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 94 : CT - The denominator exclusion id `(denexUuid)` has a count value that is greater than the denominator. The Denominator exclusion cannot be a greater value than the denominator.
 * 95 : CT - The Clinical Document must contain one Measure Section v4 with the extension 2017-06-01
 * 96 : CT - The APM to TIN/NPI Combination file is missing.
+* 97 : CT - CPC+ QRDA-III Submissions require a valid Cehrt ID (Valid Format: XX15EXXXXXXXXXX)
+* 98 : CT - The performance rate cannot have a value of 0 and must be of value Null Attribute (NA).
+* 99 : CT - The measure id `(Measure Id)` has a duplicate & invalid supplemental data of type `(Supplemental Type)`
+* 100 : CT - More than one Cehrt ID was found. Please submit with only one Cehrt id.

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

@@ -39,7 +39,7 @@ public enum ProblemCode implements LocalizedProblem {
 		+ "Measure Performed child"),
 	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 "
+	DENOMINATOR_COUNT_INVALID(13, "Denominator count must be equal to Initial Population count "
 			+ "for a measure that is a proportion measure"),
 	POPULATION_CRITERIA_COUNT_INCORRECT(14,
 			"The electronic measure id: `(Current eMeasure ID)` requires `(Number of Subpopulations required)` "
@@ -182,7 +182,12 @@ public enum ProblemCode implements LocalizedProblem {
 	CPC_PLUS_DENEX_GREATER_THAN_DENOMINATOR(94, "The denominator exclusion id `(denexUuid)` has a count value that is greater than the "
 		+ "denominator. The Denominator exclusion cannot be a greater value than the denominator.", true),
 	MEASURE_SECTION_V4_REQUIRED(95, "The Clinical Document must contain one Measure Section v4 with the extension 2017-06-01"),
-	MISSING_API_TIN_NPI_FILE(96, "The APM to TIN/NPI Combination file is missing.");
+	MISSING_API_TIN_NPI_FILE(96, "The APM to TIN/NPI Combination file is missing."),
+	CPC_MISSING_CEHRT_ID(97, "CPC+ QRDA-III Submissions require a valid Cehrt ID (Valid Format: XX15EXXXXXXXXXX)"),
+	CPC_PLUS_ZERO_PERFORMANCE_RATE(98, "The performance rate cannot have a value of 0 and must be of value Null Attribute (NA)."),
+	CPC_PLUS_EXTRA_SUPPLEMENTAL_DATA(99, "The measure id `(Measure Id)` has a duplicate & invalid supplemental data of type `(Supplemental Type)`", true),
+	CPC_PLUS_DUPLICATE_CEHRT(100, "More than one Cehrt ID was found. Please submit with only one Cehrt id.");
+
 
 	private static final Map<Integer, ProblemCode> CODE_TO_VALUE = Arrays.stream(values())
 			.collect(Collectors.toMap(ProblemCode::getCode, Function.identity()));

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

@@ -18,6 +18,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -97,6 +98,7 @@ protected void performValidation(Node node) {
 			validateNumberOfTinsAndNpis(node);
 			validateApmNpiCombination(node);
 		}
+		validateCehrtId(node);
 	}
 
 	/**
@@ -150,6 +152,21 @@ private void validateApmNpiCombination(Node node) {
 		context.getPiiValidator().validateApmTinNpiCombination(node, this);
 	}
 
+	private void validateCehrtId(Node node) {
+		String cehrtId = node.getValue(ClinicalDocumentDecoder.CEHRT);
+		if(cehrtId == null || cehrtId.length() != 15 || !cehrtFormat(cehrtId.substring(2, 5))) {
+			addError(Detail.forProblemAndNode(ProblemCode.CPC_MISSING_CEHRT_ID, node));
+		}
+		List<String> duplicateCehrts = node.getDuplicateValues(ClinicalDocumentDecoder.CEHRT);
+		if (duplicateCehrts != null && duplicateCehrts.size() > 0) {
+			addError(Detail.forProblemAndNode(ProblemCode.CPC_PLUS_DUPLICATE_CEHRT, node));
+		}
+	}
+
+	private boolean cehrtFormat(String requiredSubstring) {
+		return requiredSubstring.equalsIgnoreCase("15E");
+	}
+
 	/**
 	 * Validates the submission is not after the set end date
 	 *

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

@@ -6,8 +6,8 @@
 import gov.cms.qpp.conversion.model.TemplateId;
 import gov.cms.qpp.conversion.model.Validator;
 import gov.cms.qpp.conversion.model.error.Detail;
-import gov.cms.qpp.conversion.model.error.ProblemCode;
 import gov.cms.qpp.conversion.model.error.LocalizedProblem;
+import gov.cms.qpp.conversion.model.error.ProblemCode;
 import gov.cms.qpp.conversion.model.validation.MeasureConfig;
 import gov.cms.qpp.conversion.model.validation.SupplementalData;
 import gov.cms.qpp.conversion.model.validation.SupplementalData.SupplementalType;
@@ -67,6 +67,11 @@ private void validateAllSupplementalNodesOfSpecifiedType(
 		MeasureConfig measureConfig = MeasureConfigHelper.getMeasureConfig(node.getParent());
 		if (measureConfig != null) {
 			String electronicMeasureId = measureConfig.getElectronicMeasureId();
+			if (supplementalDataNodes.size() > codes.size()) {
+				LocalizedProblem error =
+					ProblemCode.CPC_PLUS_EXTRA_SUPPLEMENTAL_DATA.format(electronicMeasureId, supplementalDataType);
+				addError(Detail.forProblemAndNode(error, node));
+			}
 			for (SupplementalData supplementalData : codes) {
 				Node validatedSupplementalNode = filterCorrectNode(supplementalDataNodes, supplementalData);
 

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

@@ -100,6 +100,8 @@ protected void performValidation(Node node) {
 				}
 				//skip if performance rate is missing
 				if (null != performanceRateNode) {
+					String performanceRateValue =
+						performanceRateNode.getValue(PerformanceRateProportionMeasureDecoder.PERFORMANCE_RATE);
 					if (PerformanceRateValidator.NULL_ATTRIBUTE.equals(
 						performanceRateNode.getValue(PerformanceRateProportionMeasureDecoder.NULL_PERFORMANCE_RATE))) {
 						if (performanceDenominator != 0) {
@@ -108,6 +110,9 @@ protected void performValidation(Node node) {
 									.format(performanceRateNode
 										.getValue(PerformanceRateProportionMeasureDecoder.PERFORMANCE_RATE_ID)), node));
 						}
+					} else if (performanceRateValue != null && NumberHelper.isNumeric(performanceRateValue)
+						&& Double.valueOf(performanceRateValue) == 0 && (denominatorValue == 0 || performanceDenominator == 0)) {
+						addError(Detail.forProblemAndNode(ProblemCode.CPC_PLUS_ZERO_PERFORMANCE_RATE, node));
 					}
 				}
 

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

@@ -225,8 +225,8 @@ private void validateDenominatorCount(Node denomCount, Node ipopCount) {
 				.incompleteValidation()
 				.intValue(ProblemCode.AGGREGATE_COUNT_VALUE_NOT_INTEGER,
 						AggregateCountDecoder.AGGREGATE_COUNT)
-				.lessThanOrEqualTo(ProblemCode.DENOMINATOR_COUNT_INVALID,
-						Integer.parseInt(ipopCount.getValue(AggregateCountDecoder.AGGREGATE_COUNT)));
+				.valueIn(ProblemCode.DENOMINATOR_COUNT_INVALID, AggregateCountDecoder.AGGREGATE_COUNT,
+						ipopCount.getValue(AggregateCountDecoder.AGGREGATE_COUNT));
 	}
 
 	/**

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

@@ -44,6 +44,8 @@ class QualityMeasureIdRoundTripTest {
 		Paths.get("src/test/resources/negative/wrongSubPopulationsMeasure135.xml");
 	static final Path MISSING_COUNT_FOR_PERF_DENOM =
 		Paths.get("src/test/resources/negative/perfDenomAggCountMissing.xml");
+	static final Path ZERO_COUNT_FOR_PERF_DENOM =
+		Paths.get("src/test/resources/negative/perfRateDenomZero.xml");
 	static final Path MIPS_APM_FILE = Paths.get("src/test/resources/CpcMipsApm-2020.xml");
 	ApmEntityIds apmEntityIds;
 
@@ -209,6 +211,23 @@ void testMissingPerfDenomAggregateCount() {
 			.contains(error);
 	}
 
+	@Test
+	void testZeroPerfRateDenom() {
+		Converter converter = new Converter(new PathSource(ZERO_COUNT_FOR_PERF_DENOM), new Context(apmEntityIds));
+		List<Detail> details = new ArrayList<>();
+
+		try {
+			converter.transform();
+		} catch (TransformException exception) {
+			AllErrors errors = exception.getDetails();
+			details.addAll(errors.getErrors().get(0).getDetails());
+		}
+
+		LocalizedProblem error = ProblemCode.CPC_PLUS_ZERO_PERFORMANCE_RATE;
+		assertThat(details).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
+			.contains(error);
+	}
+
 	@Test
 	void test2020TopLevelMipsApmSampleFile() {
 		MeasureConfigs.initMeasureConfigs(MeasureConfigs.DEFAULT_MEASURE_DATA_FILE_NAME);

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

@@ -178,6 +178,17 @@ void testCpcPlusMissingNpi() {
 			.containsExactly(ProblemCode.CPC_PLUS_NPI_REQUIRED);
 	}
 
+	@Test
+	void testCpcPlusMissingCehrt() {
+		Node clinicalDocumentNode = createValidCpcPlusClinicalDocument();
+		clinicalDocumentNode.removeValue(ClinicalDocumentDecoder.CEHRT);
+		List<Detail> errors = cpcValidator.validateSingleNode(clinicalDocumentNode).getErrors();
+
+		assertWithMessage("Must validate with the correct error")
+			.that(errors).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
+			.containsExactly(ProblemCode.CPC_MISSING_CEHRT_ID);
+	}
+
 	@Test
 	void testWarnWhenContainsIa() {
 		Node clinicalDocumentNode = createCpcPlusClinicalDocument();
@@ -202,6 +213,17 @@ void testWarnWhenContainsPi() {
 			.contains(ProblemCode.CPC_PLUS_NO_IA_OR_PI);
 	}
 
+	@Test
+	void testCpcPlusDuplicateCehrt() {
+		Node clinicalDocumentNode = createValidCpcPlusClinicalDocument();
+		clinicalDocumentNode.putValue(ClinicalDocumentDecoder.CEHRT, "XX15EXXXXXXXXXX", false);
+		List<Detail> errors = cpcValidator.validateSingleNode(clinicalDocumentNode).getErrors();
+
+		assertWithMessage("Must validate with the correct error")
+			.that(errors).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
+			.containsExactly(ProblemCode.CPC_PLUS_DUPLICATE_CEHRT);
+	}
+
 	private Node createValidCpcPlusClinicalDocument() {
 		Node clinicalDocumentNode = createCpcPlusClinicalDocument();
 		addMeasureSectionNode(clinicalDocumentNode);
@@ -216,7 +238,7 @@ private Node createCpcPlusClinicalDocument() {
 		clinicalDocumentNode.putValue(ClinicalDocumentDecoder.PRACTICE_ID, "DogCow");
 		clinicalDocumentNode.putValue(ClinicalDocumentDecoder.TAX_PAYER_IDENTIFICATION_NUMBER, "123456789");
 		clinicalDocumentNode.putValue(ClinicalDocumentDecoder.NATIONAL_PROVIDER_IDENTIFIER, "9900000099");
-		clinicalDocumentNode.putValue(ClinicalDocumentDecoder.CEHRT, "1234567890x");
+		clinicalDocumentNode.putValue(ClinicalDocumentDecoder.CEHRT, "XX15EXXXXXXXXXX");
 
 		return clinicalDocumentNode;
 	}

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

@@ -66,6 +66,21 @@ void validateFailureSupplementalDataMissingCountTest() throws Exception {
 			.contains(expectedError);
 	}
 
+	@Test
+	void validateFailureExtraSupplementalDataTest() throws Exception {
+		String failurePayerFile = TestHelper.getFixture("failureExtraSupplementalDataFile.xml");
+		Node placeholder = new QrdaDecoderEngine(new Context()).decode(XmlUtils.stringToDom(failurePayerFile));
+		CpcMeasureDataValidator validator = new CpcMeasureDataValidator();
+		Node underTest = placeholder.findFirstNode(TemplateId.MEASURE_DATA_CMS_V4);
+		List<Detail> errors = validator.validateSingleNode(underTest).getErrors();
+
+		LocalizedProblem expectedError = ProblemCode.CPC_PLUS_EXTRA_SUPPLEMENTAL_DATA.format(MEASURE_ID,
+			SupplementalData.SupplementalType.SEX);
+
+		assertThat(errors).comparingElementsUsing(DetailsErrorEquals.INSTANCE)
+			.contains(expectedError);
+	}
+
 	@DisplayName("Should fail on absent supplemental race data")
 	@ParameterizedTest(name = "{index} => Supplemental data=''{0}''")
 	@EnumSource(value = SupplementalData.class, mode = EnumSource.Mode.INCLUDE,

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

@@ -9,6 +9,7 @@
 import org.junit.jupiter.api.Test;
 
 import gov.cms.qpp.conversion.decode.AggregateCountDecoder;
+import gov.cms.qpp.conversion.decode.PerformanceRateProportionMeasureDecoder;
 import gov.cms.qpp.conversion.model.Node;
 import gov.cms.qpp.conversion.model.TemplateId;
 import gov.cms.qpp.conversion.model.error.Detail;
@@ -28,7 +29,7 @@ void setUp() {
 		validator = new CpcQualityMeasureIdValidator();
 
 		testNode = new Node(TemplateId.MEASURE_REFERENCE_RESULTS_CMS_V4);
-		testNode.putValue(MeasureConfigHelper.MEASURE_ID,MEASURE_ID);
+		testNode.putValue(MeasureConfigHelper.MEASURE_ID, MEASURE_ID);
 	}
 
 	@Test