MAT-6654 fixed fhir terminology validation

MeasureAuthoringTool · Feb 1, 2024 · 4a9d2ea · 4a9d2ea
1 parent 4e9d93b
commit 4a9d2ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/validations/editorValidation.test.ts b/src/validations/editorValidation.test.ts
@@ -207,7 +207,7 @@ describe("Editor Validation Test", () => {
       "include FHIRHelpers version '4.0.1' \n" +
       "codesystem \"ActPriority:HL7V3.0_2021-03\": 'http://terminology.hl7.org/CodeSystem/v3-ActPriority' version 'HL7V3.0_2021-03' \n" +
       "code \"preop\": 'p' from \"ActPriority:HL7V3.0_2021-03\" display 'preop' \n" +
-      'valueset "ONC Administrative Sex": "http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1" "url": \'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.\' \n';
+      'valueset "ONC Administrative Sex": "http://cts.nlm.nih.gov/fhirother/ValueSet/2.16.840.1.113762.1.4.1" "url": \'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.\' \n';
 
     const elmTranslationWithValuesetError: ElmTranslation = {
       externalErrors: [],

diff --git a/src/validations/valuesetValidation.ts b/src/validations/valuesetValidation.ts
@@ -15,6 +15,19 @@ const GetValueSetErrors = async (
       valuesetsArray.map(async (valueSet) => {
         const oid = getOidFromCqlValueSet(valueSet, model);
         const locator = getLocatorFromCqlValueSet(valueSet);
+        if (model === "QICore") {
+          const splitValuesetUrl = valueSet?.url?.split("ValueSet/");
+          if (
+            splitValuesetUrl &&
+            splitValuesetUrl[0] !== "'http://cts.nlm.nih.gov/fhir/"
+          ) {
+            const errorString = processValueSetErrorForElmTranslationError(
+              `"valueset url(${valueSet.url}) is not in the correct format"`,
+              locator
+            );
+            valuesetsErrorArray.push(errorString);
+          }
+        }
         await terminologyServiceApi
           .getValueSet(oid, locator, loggedInUMLS)
           .then((response) => {