sdc-qrf 0.3.17 → 0.3.18

package/src/converter/__tests__/resources/questionnaire_fhir/source_queries.json

@@ -1,37 +1,41 @@
 {
-  "meta": {
-    "profile": ["https://beda.software/beda-emr-questionnaire"]
-  },
-  "item": [
-    {
-      "linkId": "question-1",
-      "type": "string",
-      "text": "Question"
-    }
-  ],
-  "status": "active",
-  "resourceType": "Questionnaire",
-  "contained": [
-    {
-      "id": "PrePopQuery",
-      "type": "batch",
-      "entry": [
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"]
+    },
+    "item": [
         {
-          "request": {
-            "url": "Patient?_id={{%LaunchPatient.id}}",
-            "method": "GET"
-          }
+            "linkId": "question-1",
+            "type": "string",
+            "text": "Question"
         }
-      ],
-      "resourceType": "Bundle"
-    }
-  ],
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries",
-      "valueReference": {
-        "reference": "#Bundle#PrePopQuery"
-      }
-    }
-  ]
+    ],
+    "status": "active",
+    "resourceType": "Questionnaire",
+    "contained": [
+        {
+            "id": "PrePopQuery",
+            "type": "batch",
+            "entry": [
+                {
+                    "request": {
+                        "url": "Patient?_id={{%LaunchPatient.id}}",
+                        "method": "GET"
+                    }
+                }
+            ],
+            "resourceType": "Bundle"
+        }
+    ],
+    "extension": [
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries",
+            "valueReference": {
+                "reference": "#Bundle#PrePopQuery"
+            }
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "source-queries"
+        }
+    ]
 }

package/src/converter/__tests__/resources/questionnaire_fhir/unit-option.json

@@ -34,6 +34,12 @@
     "meta": {
         "profile": ["https://beda.software/beda-emr-questionnaire"]
     },
+    "extension": [
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "unit-option"
+        }
+    ],
     "status": "active",
     "id": "unit-option",
     "resourceType": "Questionnaire"

package/src/converter/__tests__/resources/questionnaire_fhir/vitals.json

@@ -309,6 +309,10 @@
             "valueReference": {
                 "reference": "Mapping/vitals"
             }
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "vitals"
         }
     ],
     "status": "active",

package/src/converter/fceToFhir/questionnaire/processExtensions.ts

@@ -3,7 +3,7 @@ import { Extension as FHIRExtension, Questionnaire as FHIRQuestionnaire } from '
 import { Questionnaire as FCEQuestionnaire } from '@beda.software/aidbox-types';
 
 export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestionnaire {
-    const { launchContext, mapping, sourceQueries, targetStructureMap, ...fhirQuestionnaire } =
+    const { launchContext, mapping, sourceQueries, targetStructureMap, assembledFrom, ...fhirQuestionnaire } =
         questionnaire;
 
     let extensions: FHIRExtension[] = [];
@@ -68,6 +68,13 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
         );
     }
 
+    if (assembledFrom) {
+        extensions.push({
+            url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom',
+            valueCanonical: assembledFrom,
+        });
+    }
+
     if (extensions.length) {
         fhirQuestionnaire.extension = (fhirQuestionnaire.extension ?? []).concat(extensions);
     }

package/src/converter/fhirToFce/questionnaire/processExtensions.ts

@@ -1,3 +1,4 @@
+import { canonical } from '@beda.software/aidbox-types';
 import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 
 export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
@@ -5,17 +6,20 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
     mapping?: any[];
     sourceQueries?: any[];
     targetStructureMap?: any[];
+    assembledFrom?: any;
 } {
     const launchContext = processLaunchContext(fhirQuestionnaire);
     const mapping = processMapping(fhirQuestionnaire);
     const sourceQueries = processSourceQueries(fhirQuestionnaire);
     const targetStructureMap = processTargetStructureMap(fhirQuestionnaire);
+    const assembledFrom = processAssembledFrom(fhirQuestionnaire);
 
     return {
         launchContext: launchContext?.length ? launchContext : undefined,
         mapping: mapping?.length ? mapping : undefined,
         sourceQueries: sourceQueries?.length ? sourceQueries : undefined,
         targetStructureMap: targetStructureMap?.length ? targetStructureMap : undefined,
+        assembledFrom: assembledFrom ? assembledFrom : undefined,
     };
 }
 
@@ -23,9 +27,7 @@ export function processLaunchContext(fhirQuestionnaire: FHIRQuestionnaire): any[
     let launchContextExtensions = fhirQuestionnaire.extension ?? [];
 
     launchContextExtensions = launchContextExtensions.filter(
-        (ext) =>
-            ext.url ===
-            'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext',
+        (ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext',
     );
 
     if (launchContextExtensions.length === 0) {
@@ -35,12 +37,8 @@ export function processLaunchContext(fhirQuestionnaire: FHIRQuestionnaire): any[
     const launchContextArray = [];
     for (const launchContextExtension of launchContextExtensions) {
         const nameExtension = launchContextExtension.extension?.find((ext) => ext.url === 'name');
-        const typeExtensions = launchContextExtension.extension?.filter(
-            (ext) => ext.url === 'type',
-        );
-        const descriptionExtension = launchContextExtension.extension?.find(
-            (ext) => ext.url === 'description',
-        );
+        const typeExtensions = launchContextExtension.extension?.filter((ext) => ext.url === 'type');
+        const descriptionExtension = launchContextExtension.extension?.find((ext) => ext.url === 'description');
 
         const nameCode = nameExtension?.valueCoding?.code;
         const typeCodes = typeExtensions?.map((typeExtension) => typeExtension.valueCode!);
@@ -90,9 +88,7 @@ function processMapping(fhirQuestionnaire: FHIRQuestionnaire): any[] | undefined
 function processSourceQueries(fhirQuestionnaire: FHIRQuestionnaire): any[] {
     const extensions =
         fhirQuestionnaire.extension?.filter(
-            (ext) =>
-                ext.url ===
-                'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries',
+            (ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries',
         ) ?? [];
 
     return extensions.map((ext) => ({
@@ -102,9 +98,7 @@ function processSourceQueries(fhirQuestionnaire: FHIRQuestionnaire): any[] {
 
 function processTargetStructureMap(fhirQuestionnaire: FHIRQuestionnaire): string[] | undefined {
     const extensions = fhirQuestionnaire.extension?.filter(
-        (ext) =>
-            ext.url ===
-            'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap',
+        (ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap',
     );
 
     if (!extensions) {
@@ -113,3 +107,15 @@ function processTargetStructureMap(fhirQuestionnaire: FHIRQuestionnaire): string
 
     return extensions.map((extension) => extension.valueCanonical!);
 }
+
+function processAssembledFrom(fhirQuestionnaire: FHIRQuestionnaire): canonical | undefined {
+    const extension = fhirQuestionnaire.extension?.find(
+        (ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom',
+    );
+
+    if (!extension) {
+        return undefined;
+    }
+
+    return extension.valueCanonical;
+}