Merge pull request #29 from mlaletina95/launch-context-patient-code

fix: SDC launchContext code patient (was Patient)

Author: ir4y

resources/Questionnaire/extract-vital-signs.yaml

@@ -9,7 +9,8 @@ meta:
     - https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire
 launchContext:
   - name:
-      code: Patient
+      system: http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
+      code: patient
     type:
       - Patient
 contained:
@@ -41,7 +42,7 @@ item:
     hidden: true
     initialExpression:
       language: text/fhirpath
-      expression: "%Patient.id.first()"
+      expression: "%patient.id.first()"
 
   - linkId: body-temperature
     text: Body temperature

resources/Questionnaire/initial-expression.yaml

@@ -9,7 +9,8 @@ meta:
     - https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire
 launchContext:
   - name:
-      code: Patient
+      system: http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
+      code: patient
     type:
       - Patient
 item:
@@ -20,4 +21,4 @@ item:
     entryFormat: Firstname Lastname
     initialExpression:
       language: text/fhirpath
-      expression: "%Patient.name.given.first() & ' ' & %Patient.name.family.first()"
+      expression: "%patient.name.given.first() & ' ' & %patient.name.family.first()"

resources/Questionnaire/launch-context.yaml

@@ -9,14 +9,15 @@ meta:
     - https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire
 launchContext:
   - name:
-      code: Patient
+      system: http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
+      code: patient
     type:
       - Patient
 item:
   - linkId: instructions
     text: >-
       Instructions: Open this form in Patient context.
-      Patient ID and full name are prefilled from %Patient launch context.
+      Patient ID and full name are prefilled from %patient launch context.
     type: display
 
   - linkId: patient-id
@@ -25,12 +26,12 @@ item:
     readOnly: true
     initialExpression:
       language: text/fhirpath
-      expression: "%Patient.id.first()"
+      expression: "%patient.id.first()"
 
   - linkId: patient-name
     text: Patient name from launchContext
     type: string
     readOnly: true
     initialExpression:
       language: text/fhirpath
-      expression: "%Patient.name.first().given.first() + ' ' + %Patient.name.first().family"
+      expression: "%patient.name.first().given.first() + ' ' + %patient.name.first().family"

resources/Questionnaire/source-queries.yaml

@@ -9,7 +9,8 @@ meta:
     - https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire
 launchContext:
   - name:
-      code: Patient
+      system: http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
+      code: patient
     type:
       - Patient
 sourceQueries:
@@ -21,7 +22,7 @@ contained:
     entry:
       - request:
           method: GET
-          url: /Condition?patient=Patient/{{ %Patient.id }}&_sort=-recorded-date&_count=200
+          url: /Condition?patient=Patient/{{ %patient.id }}&_sort=-recorded-date&_count=200
 item:
   - linkId: conditions-summary
     text: Conditions
@@ -31,7 +32,5 @@ item:
       language: text/fhirpath
       expression: >-
         %ConditionBundle.entry.resource.entry.resource
-        .select(
-          'Name: ' & (code.coding.first().display | code.text).first()
-        )
+        .select('Name: ' & (code.coding.first().display | code.text).first())
         .join('\n')