Merge pull request #959 from CMSgov/QPPSF-5650

CPC+ Cehrt ID Warning Removal
CMSgov · Jan 21, 2020 · aab99c8 · aab99c8
2 parents 456e82c + 5c7aea8
commit aab99c8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/ERROR_MESSAGES.md b/ERROR_MESSAGES.md
@@ -69,7 +69,6 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 80 : CT - The given National Provider Identifier `(npi)`, Taxpayer Identification Number `(tin)`, and Alternative Payment Model `(apm)` are not a valid combination
 * 81 : CT - At least one measure is required in a measure section
 * 82 : CT - There are too many errors associated with this QRDA-III file. Showing 100 out of `(Error amount)` errors. Please fix the given errors and re-submit
-* 83 : CT - CPC+ submissions should contain a CEHRT. Please refer to the `(Submission year's)` IG for more details https://ecqi.healthit.gov/system/files/2019_CMS_QRDA_III_Eligible_Clinicians_and_EP_IG-508.pdf#page=15 regarding practice CEHRTs.
 * 84 : CT - CPC+ QRDA-III Submissions require at least one TIN to be present.
 * 85 : CT - CPC+ QRDA-III Submission TINs require a 9 digit numerical value
 * 86 : CT - This CPC+ QRDA-III submission is missing a TIN. Please ensure there is a TIN associated with every NPI submitted

diff --git a/commons/src/main/java/gov/cms/qpp/conversion/model/error/ErrorCode.java b/commons/src/main/java/gov/cms/qpp/conversion/model/error/ErrorCode.java
@@ -162,9 +162,6 @@ public enum ErrorCode implements LocalizedError {
 	MEASURE_SECTION_MISSING_MEASURE(81, "At least one measure is required in a measure section"),
 	TOO_MANY_ERRORS(82, "There are too many errors associated with this QRDA-III file. Showing 100 out of `(Error amount)` errors."
 		+ " Please fix the given errors and re-submit", true),
-	MISSING_CEHRT(83, "CPC+ submissions should contain a CEHRT."
-		+ " Please refer to the `(Submission year's)` IG for more details " + DocumentationReference.CEHRT
-	    + " regarding practice CEHRTs.", true),
 	CPC_PLUS_TIN_REQUIRED(84, "CPC+ QRDA-III Submissions require at least one TIN to be present."),
 	CPC_PLUS_INVALID_TIN(85, "CPC+ QRDA-III Submission TINs require a 9 digit numerical value"),
 	CPC_PLUS_MISSING_TIN(86, "This CPC+ QRDA-III submission is missing a TIN. Please ensure there is a TIN associated with every "

diff --git a/converter/src/main/java/gov/cms/qpp/conversion/validate/CpcClinicalDocumentValidator.java b/converter/src/main/java/gov/cms/qpp/conversion/validate/CpcClinicalDocumentValidator.java
@@ -78,7 +78,6 @@ protected void performValidation(Node node) {
 					1, TemplateId.MEASURE_SECTION_V3);
 
 		checkWarnings(node)
-			.valueIsNotEmpty(ErrorCode.MISSING_CEHRT.format(Context.REPORTING_YEAR), ClinicalDocumentDecoder.CEHRT)
 			.doesNotHaveChildren(ErrorCode.CPC_PLUS_NO_IA_OR_PI, TemplateId.IA_SECTION, TemplateId.PI_SECTION);
 
 		validateApmEntityId(node);

diff --git a/converter/src/test/java/gov/cms/qpp/acceptance/cpc/CpcPlusAcceptanceTest.java b/converter/src/test/java/gov/cms/qpp/acceptance/cpc/CpcPlusAcceptanceTest.java
@@ -72,16 +72,19 @@ private static boolean isXml(Path path) {
 	@MethodSource("successData")
 	void testCpcPlusFileSuccesses(Path entry) {
 		AllErrors errors = null;
+		List<Detail> warnings = null;
 
 		Converter converter = new Converter(new PathSource(entry));
 
 		try {
 			converter.transform();
 		} catch (TransformException failure) {
 			errors = failure.getDetails();
+			warnings = failure.getConversionReport().getWarnings();
 		}
 
 		assertThat(errors).isNull();
+		assertThat(warnings).isNull();
 	}
 
 	@ParameterizedTest

diff --git a/converter/src/test/resources/cpc_plus/success/ComprehensivePrimaryCareSampleQRDA-III_SDE.xml b/converter/src/test/resources/cpc_plus/success/ComprehensivePrimaryCareSampleQRDA-III_SDE.xml
@@ -73,12 +73,7 @@
       </representedOrganization>
     </assignedEntity>
   </legalAuthenticator>
-  <participant typeCode="DEV">
-    <associatedEntity classCode="RGPR">
-      <id root="2.16.840.1.113883.3.2074.1" extension="CMS_EHR_Certification_Identification_Number_Goes_Here" />
-      <code code="129465004" displayName="medical record, device" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT" />
-    </associatedEntity>
-  </participant>
+  <!--Remove cehrt id-->
   <!--Practice Site-->
   <participant typeCode="LOC">
     <associatedEntity classCode="SDLOC">

diff --git a/sample-files/2019/cpcPlusMultiValidApmCombo.xml b/sample-files/2019/cpcPlusMultiValidApmCombo.xml
@@ -73,12 +73,7 @@
       </representedOrganization>
     </assignedEntity>
   </legalAuthenticator>
-  <participant typeCode="DEV">
-    <associatedEntity classCode="RGPR">
-      <id root="2.16.840.1.113883.3.2074.1" extension="XX15EXXXXXXXXXX" />
-      <code code="129465004" displayName="medical record, device" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT" />
-    </associatedEntity>
-  </participant>
+
   <!--Practice Site-->
   <participant typeCode="LOC">
     <associatedEntity classCode="SDLOC">