Merge pull request #206 from swmuir/master

Updates for SITE4084
onc-healthit · Jun 24, 2024 · 97cba6d · 97cba6d
2 parents 1706807 + 42ea9ea
commit 97cba6d
Show file tree

Hide file tree

Showing 3 changed files with 11,467 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <content.validator.version>latestVersion</content.validator.version>
         <!-- MDHT SITE properties -->
        <mdht.models.groupid>mdht.openhealthtools.mdht.cda</mdht.models.groupid>
-        <mdht.models.version>3.0.0.20240603</mdht.models.version>
+        <mdht.models.version>3.0.0.20240624</mdht.models.version>
         <ds4pcontent.groupId>mdht.hl7.ds4p</ds4pcontent.groupId>
         <ds4pcontent.version>${mdht.models.version}</ds4pcontent.version>       
         <mdht.plugins.groupId>mdht.eclipse.mdht</mdht.plugins.groupId>

diff --git a/src/test/java/org/sitenv/referenceccda/test/tests/RefCCDATest.java b/src/test/java/org/sitenv/referenceccda/test/tests/RefCCDATest.java
@@ -67,7 +67,7 @@ public class RefCCDATest extends ReferenceValidationTester implements Validation
 			SUB_PROCEDURES_WITH_DEVICE_IDENTIFIER_OBSERVATION_BAD_VALUE_ROOT_SITE_3218 = 17,
 			DS4P_REFRAIN_OBSERVATION = 18, IVL_REAL_EXAMPLE = 19, IVL_REAL_EXAMPLE2 = 20, REFERRAL_NOTE = 21,
 			REFERRAL_NOTE2 = 22, SDTCTEST = 23, CONSOLNOTEACTIVITY = 24, MEDICATION_SECTION_CODE_INVALID = 25,
-			MARITALSTATUS = 26, MARITALSTATUS2 = 27, LOTORBATCH = 28, APPENDIXAANDB = 29,SVAPCCD2023=30,SVAPCCD20232=31;
+			MARITALSTATUS = 26, MARITALSTATUS2 = 27, LOTORBATCH = 28, APPENDIXAANDB = 29,SVAPCCD2023=30,SVAPCCD20232=31,LARSON=32;
 
 
 	// Feel free to add docs to the end but don't alter existing data
@@ -106,7 +106,8 @@ public class RefCCDATest extends ReferenceValidationTester implements Validation
 					RefCCDATest.class.getResource("/lotorbatch.xml").toURI(),
 					RefCCDATest.class.getResource("/AppendixAandB.xml").toURI(),
 					RefCCDATest.class.getResource("/2023SVAPCCD.xml").toURI(),
-					RefCCDATest.class.getResource("/2023SVAPCCD2.xml").toURI()
+					RefCCDATest.class.getResource("/2023SVAPCCD2.xml").toURI(),
+					RefCCDATest.class.getResource("/LarsonHealthSummaryExp225.9.24.xml").toURI()
 			};
 		} catch (URISyntaxException e) {
 			if (LOG_RESULTS_TO_CONSOLE)
@@ -1458,5 +1459,23 @@ public void testHealthStatusSITE4082() {
 		printResults(getMDHTErrorsFromResults(results));
 		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "CONF:1098-9075");
 	}
+
+	@Test
+	public void testHealthStatusSITE4084() {
+		// https://oncprojectracking.healthit.gov/support/browse/SITE-3762
+		ArrayList<RefCCDAValidationResult> results = validateDocumentAndReturnResults(
+				convertCCDAFileToString(CCDA_FILES[LARSON]));
+		println("global result");
+//		assertFalse("The document does not have schema error yet the flag is set to true",
+//				mdhtResultsHaveSchemaError(results));
+//		println("and for sanity, check the single results as well");
+
+		printResults(getMDHTErrorsFromResults(results));
+		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "4515-16754");
+//		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_WARN, "4515-16754");
+	}
+
+
+
 
-}
+}