sdc-qrf 0.3.17 → 0.3.18

package/src/converter/__tests__/resources/questionnaire_fhir/gad_7.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": [
@@ -481,9 +476,13 @@
             "valueReference": {
                 "reference": "Mapping/gad-7-extract"
             }
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "gad-7"
         }
     ],
     "status": "active",
     "id": "gad-7",
     "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/gad7"
-}
+}

package/src/converter/__tests__/resources/questionnaire_fhir/immunization.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": [
@@ -207,9 +202,13 @@
             "valueReference": {
                 "reference": "Mapping/immunization-extract"
             }
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "immunization"
         }
     ],
     "status": "active",
     "id": "immunization",
     "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/immunization"
-}
+}

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

@@ -1,226 +1,230 @@
 {
-  "subjectType": ["Encounter", "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": "Medication",
-  "item": [
-    {
-      "text": "DateTime",
-      "type": "dateTime",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-          "valueBoolean": true
-        },
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "now()"
-          }
-        }
-      ],
-      "linkId": "dateTime"
-    },
-    {
-      "text": "EncounterId",
-      "type": "string",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-          "valueBoolean": true
-        },
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%Encounter.id"
-          }
-        }
-      ],
-      "linkId": "encounterId"
-    },
-    {
-      "text": "PatientId",
-      "type": "string",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-          "valueBoolean": true
-        },
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%Patient.id"
-          }
-        }
-      ],
-      "linkId": "patientId",
-      "required": true
+    "subjectType": ["Encounter", "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": "PatientName",
-      "type": "string",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-          "valueBoolean": true
-        },
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%Patient.name.given[0] + ' ' + %Patient.name.family"
-          }
-        }
-      ],
-      "linkId": "patientName"
-    },
-    {
-      "text": "Medication name",
-      "type": "choice",
-      "linkId": "medication",
-      "required": true,
-      "answerOption": [
-        {
-          "valueCoding": {
-            "code": "261000",
-            "system": "http://snomed.info/sct",
-            "display": "Codeine phosphate"
-          }
+    "name": "Medication",
+    "item": [
+        {
+            "text": "DateTime",
+            "type": "dateTime",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
+                    "valueBoolean": true
+                },
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "now()"
+                    }
+                }
+            ],
+            "linkId": "dateTime"
         },
         {
-          "valueCoding": {
-            "code": "2336001",
-            "system": "http://snomed.info/sct",
-            "display": "Fibrinogen Tokyo II"
-          }
+            "text": "EncounterId",
+            "type": "string",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
+                    "valueBoolean": true
+                },
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%Encounter.id"
+                    }
+                }
+            ],
+            "linkId": "encounterId"
         },
         {
-          "valueCoding": {
-            "code": "363000",
-            "system": "http://snomed.info/sct",
-            "display": "Fibrinogen San Juan"
-          }
+            "text": "PatientId",
+            "type": "string",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
+                    "valueBoolean": true
+                },
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%Patient.id"
+                    }
+                }
+            ],
+            "linkId": "patientId",
+            "required": true
         },
         {
-          "valueCoding": {
-            "code": "519005",
-            "system": "http://snomed.info/sct",
-            "display": "Free protein S"
-          }
+            "text": "PatientName",
+            "type": "string",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
+                    "valueBoolean": true
+                },
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%Patient.name.given[0] + ' ' + %Patient.name.family"
+                    }
+                }
+            ],
+            "linkId": "patientName"
         },
         {
-          "valueCoding": {
-            "code": "585007",
-            "system": "http://snomed.info/sct",
-            "display": "SP - Substance P"
-          }
+            "text": "Medication name",
+            "type": "choice",
+            "linkId": "medication",
+            "required": true,
+            "answerOption": [
+                {
+                    "valueCoding": {
+                        "code": "261000",
+                        "system": "http://snomed.info/sct",
+                        "display": "Codeine phosphate"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "2336001",
+                        "system": "http://snomed.info/sct",
+                        "display": "Fibrinogen Tokyo II"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "363000",
+                        "system": "http://snomed.info/sct",
+                        "display": "Fibrinogen San Juan"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "519005",
+                        "system": "http://snomed.info/sct",
+                        "display": "Free protein S"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "585007",
+                        "system": "http://snomed.info/sct",
+                        "display": "SP - Substance P"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "693002",
+                        "system": "http://snomed.info/sct",
+                        "display": "Trichothecene"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "698006",
+                        "system": "http://snomed.info/sct",
+                        "display": "Erythromycin lactobionate"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "699003",
+                        "system": "http://snomed.info/sct",
+                        "display": "Coal tar extract"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "747006",
+                        "system": "http://snomed.info/sct",
+                        "display": "Oxamniquine"
+                    }
+                }
+            ]
         },
         {
-          "valueCoding": {
-            "code": "693002",
-            "system": "http://snomed.info/sct",
-            "display": "Trichothecene"
-          }
+            "text": "Dosage",
+            "type": "string",
+            "linkId": "dosage",
+            "required": true
         },
         {
-          "valueCoding": {
-            "code": "698006",
-            "system": "http://snomed.info/sct",
-            "display": "Erythromycin lactobionate"
-          }
+            "text": "Start Date",
+            "type": "date",
+            "linkId": "start-date"
         },
         {
-          "valueCoding": {
-            "code": "699003",
-            "system": "http://snomed.info/sct",
-            "display": "Coal tar extract"
-          }
+            "text": "Stop Date",
+            "type": "date",
+            "linkId": "stop-date"
         },
         {
-          "valueCoding": {
-            "code": "747006",
-            "system": "http://snomed.info/sct",
-            "display": "Oxamniquine"
-          }
+            "text": "Notes",
+            "type": "string",
+            "linkId": "notes"
         }
-      ]
-    },
-    {
-      "text": "Dosage",
-      "type": "string",
-      "linkId": "dosage",
-      "required": true
-    },
-    {
-      "text": "Start Date",
-      "type": "date",
-      "linkId": "start-date"
-    },
-    {
-      "text": "Stop Date",
-      "type": "date",
-      "linkId": "stop-date"
-    },
-    {
-      "text": "Notes",
-      "type": "string",
-      "linkId": "notes"
-    }
-  ],
-  "resourceType": "Questionnaire",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
-      "extension": [
+    ],
+    "resourceType": "Questionnaire",
+    "extension": [
         {
-          "url": "name",
-          "valueCoding": {
-            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
-            "code": "Patient"
-          }
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+            "extension": [
+                {
+                    "url": "name",
+                    "valueCoding": {
+                        "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
+                        "code": "Patient"
+                    }
+                },
+                {
+                    "url": "type",
+                    "valueCode": "Patient"
+                }
+            ]
         },
         {
-          "url": "type",
-          "valueCode": "Patient"
-        }
-      ]
-    },
-    {
-      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
-      "extension": [
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+            "extension": [
+                {
+                    "url": "name",
+                    "valueCoding": {
+                        "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
+                        "code": "Author"
+                    }
+                },
+                {
+                    "url": "type",
+                    "valueCode": "Resource"
+                }
+            ]
+        },
         {
-          "url": "name",
-          "valueCoding": {
-            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
-            "code": "Author"
-          }
+            "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
+            "valueReference": {
+                "reference": "Mapping/medication-statement-extract"
+            }
         },
         {
-          "url": "type",
-          "valueCode": "Resource"
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "medication"
         }
-      ]
-    },
-    {
-      "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
-      "valueReference": {
-        "reference": "Mapping/medication-statement-extract"
-      }
-    }
-  ],
-  "status": "active",
-  "id": "medication",
-  "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/medication"
+    ],
+    "status": "active",
+    "id": "medication",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/medication"
 }