sdc-qrf 0.3.17 → 0.3.18

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

@@ -1,87 +1,91 @@
 {
-  "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": "practitioner-create",
-  "item": [
-    {
-      "text": "Last name",
-      "type": "string",
-      "linkId": "last-name",
-      "required": true
-    },
-    {
-      "text": "First name",
-      "type": "string",
-      "linkId": "first-name"
-    },
-    {
-      "text": "Middle name",
-      "type": "string",
-      "linkId": "middle-name"
+    "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": "Specialty",
-      "type": "choice",
-      "linkId": "specialty",
-      "answerOption": [
+    "name": "practitioner-create",
+    "item": [
         {
-          "valueCoding": {
-            "code": "394577000",
-            "system": "http://snomed.info/sct",
-            "display": "Anesthetics"
-          }
+            "text": "Last name",
+            "type": "string",
+            "linkId": "last-name",
+            "required": true
         },
         {
-          "valueCoding": {
-            "code": "394579002",
-            "system": "http://snomed.info/sct",
-            "display": "Cardiology"
-          }
+            "text": "First name",
+            "type": "string",
+            "linkId": "first-name"
         },
         {
-          "valueCoding": {
-            "code": "394582007",
-            "system": "http://snomed.info/sct",
-            "display": "Dermatology"
-          }
+            "text": "Middle name",
+            "type": "string",
+            "linkId": "middle-name"
         },
         {
-          "valueCoding": {
-            "code": "394583002",
-            "system": "http://snomed.info/sct",
-            "display": "Endocrinology"
-          }
+            "text": "Specialty",
+            "type": "choice",
+            "linkId": "specialty",
+            "answerOption": [
+                {
+                    "valueCoding": {
+                        "code": "394577000",
+                        "system": "http://snomed.info/sct",
+                        "display": "Anesthetics"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "394579002",
+                        "system": "http://snomed.info/sct",
+                        "display": "Cardiology"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "394582007",
+                        "system": "http://snomed.info/sct",
+                        "display": "Dermatology"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "394583002",
+                        "system": "http://snomed.info/sct",
+                        "display": "Endocrinology"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "419772000",
+                        "system": "http://snomed.info/sct",
+                        "display": "Family practice"
+                    }
+                }
+            ]
+        }
+    ],
+    "resourceType": "Questionnaire",
+    "title": "Practitioner create",
+    "extension": [
+        {
+            "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
+            "valueReference": {
+                "reference": "Mapping/practitioner-create"
+            }
         },
         {
-          "valueCoding": {
-            "code": "419772000",
-            "system": "http://snomed.info/sct",
-            "display": "Family practice"
-          }
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "practitioner-create"
         }
-      ]
-    }
-  ],
-  "resourceType": "Questionnaire",
-  "title": "Practitioner create",
-  "extension": [
-    {
-      "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
-      "valueReference": {
-        "reference": "Mapping/practitioner-create"
-      }
-    }
-  ],
-  "status": "active",
-  "id": "practitioner-create",
-  "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/practitioner-create"
+    ],
+    "status": "active",
+    "id": "practitioner-create",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/practitioner-create"
 }

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

@@ -83,6 +83,10 @@
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap",
             "valueCanonical": "StructureMap/practitioner-create"
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "practitioner-create-structure-map"
         }
     ],
     "status": "active",

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

@@ -1,193 +1,197 @@
 {
-  "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": "practitioner edit",
-  "item": [
-    {
-      "text": "practitionerId",
-      "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": "%Practitioner.id"
-          }
-        }
-      ],
-      "linkId": "practitioner-id",
-      "readOnly": true
+    "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": "practitionerRoleId",
-      "type": "string",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-          "valueBoolean": true
+    "name": "practitioner edit",
+    "item": [
+        {
+            "text": "practitionerId",
+            "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": "%Practitioner.id"
+                    }
+                }
+            ],
+            "linkId": "practitioner-id",
+            "readOnly": true
         },
         {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%PractitionerRole.id"
-          }
-        }
-      ],
-      "linkId": "practitioner-role-id",
-      "readOnly": true
-    },
-    {
-      "text": "First name",
-      "type": "string",
-      "linkId": "first-name",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%Practitioner.name.given[0]"
-          }
-        }
-      ]
-    },
-    {
-      "text": "Middle name",
-      "type": "string",
-      "linkId": "middle-name",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%Practitioner.name.given[1]"
-          }
-        }
-      ]
-    },
-    {
-      "text": "Last name",
-      "type": "string",
-      "linkId": "last-name",
-      "required": true,
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%Practitioner.name.family"
-          }
-        }
-      ]
-    },
-    {
-      "text": "Specialty",
-      "type": "choice",
-      "linkId": "specialty",
-      "answerOption": [
-        {
-          "valueCoding": {
-            "code": "394577000",
-            "system": "http://snomed.info/sct",
-            "display": "Anesthetics"
-          }
+            "text": "practitionerRoleId",
+            "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": "%PractitionerRole.id"
+                    }
+                }
+            ],
+            "linkId": "practitioner-role-id",
+            "readOnly": true
         },
         {
-          "valueCoding": {
-            "code": "394579002",
-            "system": "http://snomed.info/sct",
-            "display": "Cardiology"
-          }
+            "text": "First name",
+            "type": "string",
+            "linkId": "first-name",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%Practitioner.name.given[0]"
+                    }
+                }
+            ]
         },
         {
-          "valueCoding": {
-            "code": "394582007",
-            "system": "http://snomed.info/sct",
-            "display": "Dermatology"
-          }
+            "text": "Middle name",
+            "type": "string",
+            "linkId": "middle-name",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%Practitioner.name.given[1]"
+                    }
+                }
+            ]
         },
         {
-          "valueCoding": {
-            "code": "394583002",
-            "system": "http://snomed.info/sct",
-            "display": "Endocrinology"
-          }
+            "text": "Last name",
+            "type": "string",
+            "linkId": "last-name",
+            "required": true,
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%Practitioner.name.family"
+                    }
+                }
+            ]
         },
         {
-          "valueCoding": {
-            "code": "419772000",
-            "system": "http://snomed.info/sct",
-            "display": "Family practice"
-          }
-        }
-      ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
-          "valueExpression": {
-            "language": "text/fhirpath",
-            "expression": "%PractitionerRole.specialty[0].coding"
-          }
+            "text": "Specialty",
+            "type": "choice",
+            "linkId": "specialty",
+            "answerOption": [
+                {
+                    "valueCoding": {
+                        "code": "394577000",
+                        "system": "http://snomed.info/sct",
+                        "display": "Anesthetics"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "394579002",
+                        "system": "http://snomed.info/sct",
+                        "display": "Cardiology"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "394582007",
+                        "system": "http://snomed.info/sct",
+                        "display": "Dermatology"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "394583002",
+                        "system": "http://snomed.info/sct",
+                        "display": "Endocrinology"
+                    }
+                },
+                {
+                    "valueCoding": {
+                        "code": "419772000",
+                        "system": "http://snomed.info/sct",
+                        "display": "Family practice"
+                    }
+                }
+            ],
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                    "valueExpression": {
+                        "language": "text/fhirpath",
+                        "expression": "%PractitionerRole.specialty[0].coding"
+                    }
+                }
+            ]
         }
-      ]
-    }
-  ],
-  "resourceType": "Questionnaire",
-  "title": "Practitioner edit",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
-      "extension": [
+    ],
+    "resourceType": "Questionnaire",
+    "title": "Practitioner edit",
+    "extension": [
         {
-          "url": "name",
-          "valueCoding": {
-            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
-            "code": "Practitioner"
-          }
+            "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": "Practitioner"
+                    }
+                },
+                {
+                    "url": "type",
+                    "valueCode": "Practitioner"
+                }
+            ]
         },
         {
-          "url": "type",
-          "valueCode": "Practitioner"
-        }
-      ]
-    },
-    {
-      "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": "PractitionerRole"
+                    }
+                },
+                {
+                    "url": "type",
+                    "valueCode": "PractitionerRole"
+                }
+            ]
+        },
         {
-          "url": "name",
-          "valueCoding": {
-            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
-            "code": "PractitionerRole"
-          }
+            "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
+            "valueReference": {
+                "reference": "Mapping/practitioner-edit"
+            }
         },
         {
-          "url": "type",
-          "valueCode": "PractitionerRole"
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "practitioner-edit"
         }
-      ]
-    },
-    {
-      "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
-      "valueReference": {
-        "reference": "Mapping/practitioner-edit"
-      }
-    }
-  ],
-  "status": "active",
-  "id": "practitioner-edit",
-  "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/practitioner-edit"
+    ],
+    "status": "active",
+    "id": "practitioner-edit",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/practitioner-edit"
 }

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

@@ -1,44 +1,48 @@
 {
-  "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": "practitioner-role-create",
-  "item": [
-    {
-      "text": "Organization",
-      "type": "string",
-      "linkId": "organization"
-    },
-    {
-      "text": "Practitioner",
-      "type": "string",
-      "linkId": "practitioner"
+    "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": "Speciality",
-      "type": "string",
-      "linkId": "specialty"
-    }
-  ],
-  "resourceType": "Questionnaire",
-  "title": "Create practitioner role",
-  "extension": [
-    {
-      "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
-      "valueReference": {
-        "reference": "Mapping/practitioner-role-create"
-      }
-    }
-  ],
-  "status": "active",
-  "id": "practitioner-role-create",
-  "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/practitioner-role-create"
+    "name": "practitioner-role-create",
+    "item": [
+        {
+            "text": "Organization",
+            "type": "string",
+            "linkId": "organization"
+        },
+        {
+            "text": "Practitioner",
+            "type": "string",
+            "linkId": "practitioner"
+        },
+        {
+            "text": "Speciality",
+            "type": "string",
+            "linkId": "specialty"
+        }
+    ],
+    "resourceType": "Questionnaire",
+    "title": "Create practitioner role",
+    "extension": [
+        {
+            "url": "http://beda.software/fhir-extensions/questionnaire-mapper",
+            "valueReference": {
+                "reference": "Mapping/practitioner-role-create"
+            }
+        },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
+            "valueCanonical": "practitioner-role-create"
+        }
+    ],
+    "status": "active",
+    "id": "practitioner-role-create",
+    "url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/practitioner-role-create"
 }