sdc-qrf 0.3.17 → 0.3.18

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

@@ -1,34 +1,35 @@
 {
-  "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"
-    }
-  ],
-  "sourceQueries": [
-    {
-      "localRef": "Bundle#PrePopQuery"
-    }
-  ]
+    ],
+    "status": "active",
+    "resourceType": "Questionnaire",
+    "assembledFrom": "source-queries",
+    "contained": [
+        {
+            "id": "PrePopQuery",
+            "type": "batch",
+            "entry": [
+                {
+                    "request": {
+                        "url": "Patient?_id={{%LaunchPatient.id}}",
+                        "method": "GET"
+                    }
+                }
+            ],
+            "resourceType": "Bundle"
+        }
+    ],
+    "sourceQueries": [
+        {
+            "localRef": "Bundle#PrePopQuery"
+        }
+    ]
 }

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

@@ -5,6 +5,7 @@
         "profile": ["https://beda.software/beda-emr-questionnaire"]
     },
     "status": "active",
+    "assembledFrom": "unit-option",
     "item": [
         {
             "type": "quantity",

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

@@ -229,6 +229,7 @@
     ],
     "resourceType": "Questionnaire",
     "status": "active",
+    "assembledFrom": "vitals",
     "id": "vitals",
     "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/vitals"
 }

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

@@ -1,12 +1,7 @@
 {
-    "subjectType": [
-        "Encounter",
-        "Patient"
-    ],
+    "subjectType": ["Encounter", "Patient"],
     "meta": {
-        "profile": [
-            "https://beda.software/beda-emr-questionnaire"
-        ],
+        "profile": ["https://beda.software/beda-emr-questionnaire"],
         "lastUpdated": "2023-04-10T03:43:34.792167Z",
         "versionId": "694",
         "extension": [
@@ -425,9 +420,13 @@
             "valueReference": {
                 "reference": "Mapping/allergy-extract"
             }
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "allergies"
         }
     ],
     "status": "active",
     "id": "allergies",
     "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/allergies"
-}
+}

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

@@ -1,99 +1,105 @@
 {
-  "subjectType": ["Patient"],
-  "meta": {
-    "profile": ["https://beda.software/beda-emr-questionnaire"],
-    "lastUpdated": "2023-04-10T03:43:34.792167Z",
-    "versionId": "694",
-    "extension": [
-      {
-        "url": "ex:createdAt",
-        "valueInstant": "2023-04-05T05:22:35.752466Z"
-      }
-    ]
-  },
-  "name": "Beverages",
-  "item": [
-    {
-      "linkId": "slider",
-      "type": "decimal",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "code": "slider"
-              }
-            ]
-          }
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue",
-          "valueInteger": 2
-        },
-        {
-          "url": "https://beda.software/fhir-emr-questionnaire/slider-start",
-          "valueInteger": 1
-        },
-        {
-          "url": "https://beda.software/fhir-emr-questionnaire/slider-stop",
-          "valueInteger": 20
-        },
-        {
-          "url": "https://beda.software/fhir-emr-questionnaire/help-text",
-          "valueString": "How many beverages you are consuming per day?"
-        },
-        {
-          "url": "https://beda.software/fhir-emr-questionnaire/slider-stop-label",
-          "valueString": "20+"
-        }
-      ],
-      "text": "Frequency per week"
+    "subjectType": ["Patient"],
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"],
+        "lastUpdated": "2023-04-10T03:43:34.792167Z",
+        "versionId": "694",
+        "extension": [
+            {
+                "url": "ex:createdAt",
+                "valueInstant": "2023-04-05T05:22:35.752466Z"
+            }
+        ]
     },
-    {
-      "text": "Beverage",
-      "type": "choice",
-      "linkId": "beverage-type",
-      "extension": [
+    "name": "Beverages",
+    "item": [
         {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "code": "solid-radio-button"
-              }
-            ]
-          }
+            "linkId": "slider",
+            "type": "decimal",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+                    "valueCodeableConcept": {
+                        "coding": [
+                            {
+                                "code": "slider"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-sliderStepValue",
+                    "valueInteger": 2
+                },
+                {
+                    "url": "https://beda.software/fhir-emr-questionnaire/slider-start",
+                    "valueInteger": 1
+                },
+                {
+                    "url": "https://beda.software/fhir-emr-questionnaire/slider-stop",
+                    "valueInteger": 20
+                },
+                {
+                    "url": "https://beda.software/fhir-emr-questionnaire/help-text",
+                    "valueString": "How many beverages you are consuming per day?"
+                },
+                {
+                    "url": "https://beda.software/fhir-emr-questionnaire/slider-stop-label",
+                    "valueString": "20+"
+                }
+            ],
+            "text": "Frequency per week"
         },
         {
-          "url": "https://beda.software/fhir-emr-questionnaire/adjust-last-to-right",
-          "valueBoolean": true
+            "text": "Beverage",
+            "type": "choice",
+            "linkId": "beverage-type",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+                    "valueCodeableConcept": {
+                        "coding": [
+                            {
+                                "code": "solid-radio-button"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "url": "https://beda.software/fhir-emr-questionnaire/adjust-last-to-right",
+                    "valueBoolean": true
+                }
+            ],
+            "answerOption": [
+                {
+                    "valueCoding": {
+                        "code": "beer",
+                        "display": "Beer"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "wine",
+                        "display": "Wine"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "none",
+                        "display": "None"
+                    }
+                }
+            ]
         }
-      ],
-      "answerOption": [
-        {
-          "valueCoding": {
-            "code": "beer",
-            "display": "Beer"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "wine",
-            "display": "Wine"
-          }
-        },
+    ],
+    "extension": [
         {
-          "valueCoding": {
-            "code": "none",
-            "display": "None"
-          }
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "beverages"
         }
-      ]
-    }
-  ],
-  "resourceType": "Questionnaire",
-  "status": "draft",
-  "id": "beverages",
-  "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/baverages"
+    ],
+    "resourceType": "Questionnaire",
+    "status": "draft",
+    "id": "beverages",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/baverages"
 }

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

@@ -1,49 +1,55 @@
 {
-  "item": [
-    {
-      "text": "What is your favorite color?",
-      "type": "choice",
-      "linkId": "1",
-      "answerOption": [
+    "item": [
         {
-          "valueCoding": {
-            "code": "red",
-            "system": "http://example.org/colors",
-            "display": "Red"
-          }
-        },
-        {
-          "valueCoding": {
-            "code": "blue",
-            "system": "http://example.org/colors",
-            "display": "Blue"
-          }
-        },
-        {
-          "valueReference": {
-            "display": "Other",
-            "reference": "Color/123"
-          }
-        },
+            "text": "What is your favorite color?",
+            "type": "choice",
+            "linkId": "1",
+            "answerOption": [
+                {
+                    "valueCoding": {
+                        "code": "red",
+                        "system": "http://example.org/colors",
+                        "display": "Red"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "blue",
+                        "system": "http://example.org/colors",
+                        "display": "Blue"
+                    }
+                },
+                {
+                    "valueReference": {
+                        "display": "Other",
+                        "reference": "Color/123"
+                    }
+                },
+                {
+                    "valueString": "I don't have a favorite color"
+                }
+            ]
+        }
+    ],
+    "status": "draft",
+    "subjectType": ["Patient"],
+    "id": "example",
+    "resourceType": "Questionnaire",
+    "extension": [
         {
-          "valueString": "I don't have a favorite color"
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "choice-answer-option"
         }
-      ]
+    ],
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"],
+        "lastUpdated": "2023-04-24T00:09:09.518780Z",
+        "versionId": "205",
+        "extension": [
+            {
+                "url": "ex:createdAt",
+                "valueInstant": "2023-04-24T00:09:09.518780Z"
+            }
+        ]
     }
-  ],
-  "status": "draft",
-  "subjectType": ["Patient"],
-  "id": "example",
-  "resourceType": "Questionnaire",
-  "meta": {
-    "profile": ["https://beda.software/beda-emr-questionnaire"],
-    "lastUpdated": "2023-04-24T00:09:09.518780Z",
-    "versionId": "205",
-    "extension": [
-      {
-        "url": "ex:createdAt",
-        "valueInstant": "2023-04-24T00:09:09.518780Z"
-      }
-    ]
-  }
 }

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

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

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

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

package/src/converter/__tests__/resources/questionnaire_fhir/cqf-examples.json

@@ -1,100 +1,101 @@
 {
-    "subjectType": [
-     "Encounter",
-     "Patient"
-    ],
+    "subjectType": ["Encounter", "Patient"],
     "meta": {
-     "profile": [
-      "https://beda.software/beda-emr-questionnaire"
-     ],
-     "lastUpdated": "2024-11-18T13:35:34.455065Z",
-     "versionId": "11968",
-     "extension": [
-      {
-       "url": "ex:createdAt",
-       "valueInstant": "2024-11-15T17:04:52.598486Z"
-      }
-     ]
+        "profile": ["https://beda.software/beda-emr-questionnaire"],
+        "lastUpdated": "2024-11-18T13:35:34.455065Z",
+        "versionId": "11968",
+        "extension": [
+            {
+                "url": "ex:createdAt",
+                "valueInstant": "2024-11-15T17:04:52.598486Z"
+            }
+        ]
     },
     "name": "CQF Examples",
     "item": [
-     {
-      "text": "Click on this checkbox to see result",
-      "type": "boolean",
-      "linkId": "input-1"
-     },
-     {
-      "text": "This is default input label",
-      "type": "string",
-      "_text": {
-       "extension": [
         {
-         "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-         "valueExpression": {
-          "language": "text/fhirpath",
-          "expression": "iif(%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = true, 'Now the input label changed', null)"
-         }
-        }
-       ]
-      },
-      "linkId": "input-2"
-     },
-     {
-      "item": [
-       {
-        "text": "This input is disabled if the checkbox is unchecked",
-        "type": "string",
-        "linkId": "input-5",
-        "readOnly": true,
-        "_readOnly": {
-         "extension": [
-          {
-           "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-           "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = false"
-           }
-          }
-         ]
-        }
-       },
-       {
-        "text": "This input is required if the checkbox is checked",
-        "type": "string",
-        "linkId": "input-6",
-        "required": false,
-        "_required": {
-         "extension": [
-          {
-           "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-           "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = true"
-           }
-          }
-         ]
-        }
-       }
-      ],
-      "text": "This is default group label",
-      "type": "group",
-      "_text": {
-       "extension": [
+            "text": "Click on this checkbox to see result",
+            "type": "boolean",
+            "linkId": "input-1"
+        },
         {
-         "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-         "valueExpression": {
-          "language": "text/fhirpath",
-          "expression": "iif(%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = true, 'Now the group label changed', null)"
-         }
+            "text": "This is default input label",
+            "type": "string",
+            "_text": {
+                "extension": [
+                    {
+                        "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
+                        "valueExpression": {
+                            "language": "text/fhirpath",
+                            "expression": "iif(%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = true, 'Now the input label changed', null)"
+                        }
+                    }
+                ]
+            },
+            "linkId": "input-2"
+        },
+        {
+            "item": [
+                {
+                    "text": "This input is disabled if the checkbox is unchecked",
+                    "type": "string",
+                    "linkId": "input-5",
+                    "readOnly": true,
+                    "_readOnly": {
+                        "extension": [
+                            {
+                                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
+                                "valueExpression": {
+                                    "language": "text/fhirpath",
+                                    "expression": "%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = false"
+                                }
+                            }
+                        ]
+                    }
+                },
+                {
+                    "text": "This input is required if the checkbox is checked",
+                    "type": "string",
+                    "linkId": "input-6",
+                    "required": false,
+                    "_required": {
+                        "extension": [
+                            {
+                                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
+                                "valueExpression": {
+                                    "language": "text/fhirpath",
+                                    "expression": "%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = true"
+                                }
+                            }
+                        ]
+                    }
+                }
+            ],
+            "text": "This is default group label",
+            "type": "group",
+            "_text": {
+                "extension": [
+                    {
+                        "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
+                        "valueExpression": {
+                            "language": "text/fhirpath",
+                            "expression": "iif(%QuestionnaireResponse.item.where(linkId='input-1').answer.value.boolean = true, 'Now the group label changed', null)"
+                        }
+                    }
+                ]
+            },
+            "linkId": "input-3"
         }
-       ]
-      },
-      "linkId": "input-3"
-     }
     ],
     "resourceType": "Questionnaire",
     "title": "CQF Examples",
     "status": "active",
+    "extension": [
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "cqf-examples"
+        }
+    ],
     "id": "cqf-examples",
     "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/cqf-examples"
-   }
+}

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

@@ -73,6 +73,12 @@
     "subjectType": ["Patient"],
     "id": "example",
     "resourceType": "Questionnaire",
+    "extension": [
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "enable-when"
+        }
+    ],
     "meta": {
         "profile": ["https://beda.software/beda-emr-questionnaire"],
         "lastUpdated": "2023-05-07T09:04:40.566686Z",

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

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