Merge pull request #14 from beda-software/demo-prepare-updates

Save resources code as text

Author: dmitryashutov

resources/seeds/Mapping/curated-ips.yaml

@@ -13,7 +13,6 @@ body:
     - immunizationsSummary: "{{ %QuestionnaireResponse.answers('immunizations-summary') }}"
     - proceduresSummary: "{{ %QuestionnaireResponse.answers('procedures-summary') }}"
     - problemsSummary: "{{ %QuestionnaireResponse.answers('problems-summary') }}"
-    - proceduresIDs: "{[ %QuestionnaireResponse.answers('procedure-id') ]}"
     - problemItems: "{[ %QuestionnaireResponse.item.where(linkId='ips-section').item.where(linkId='problems-section').item.where(linkId='problems') ]}"
     - allergiesItems: "{[ %QuestionnaireResponse.item.where(linkId='ips-section').item.where(linkId='allergies-section').item.where(linkId='allergies') ]}"
     - medicationsItems: "{[ %QuestionnaireResponse.item.where(linkId='ips-section').item.where(linkId='medications-section').item.where(linkId='medications') ]}"
@@ -56,7 +55,7 @@ body:
               "{% if %problemsSummary.exists() %}":
                 div: "{{ %problemsSummary }}"
               "{% else %}":
-                div: "No problems found"
+                div: "No summary provided"
             "{% if %problemItems.count() > 0 %}":
               entry:
                 "{% for index, problemItem in %problemItems %}":
@@ -82,7 +81,7 @@ body:
               "{% if %allergiesSummary.exists() %}":
                 div: "{{ %allergiesSummary }}"
               "{% else %}":
-                div: "No allergies found"
+                div: "No summary provided"
             "{% if %allergiesItems.count() > 0 %}":
               entry:
                 "{% for index, allergyItem in %allergiesItems %}":
@@ -108,7 +107,7 @@ body:
               "{% if %medicationsSummary.exists() %}":
                 div: "{{ %medicationsSummary }}"
               "{% else %}":
-                div: "No medications found"
+                div: "No summary provided"
             "{% if %medicationsItems.count() > 0 %}":
               entry:
                 "{% for index, medicationItem in %medicationsItems %}":
@@ -134,7 +133,7 @@ body:
               "{% if %immunizationsSummary.exists() %}":
                 div: "{{ %immunizationsSummary }}"
               "{% else %}":
-                div: "No immunizations found"
+                div: "No summary provided"
             "{% if %immunizationsItems.count() > 0 %}":
               entry:
                 "{% for index, immunizationItem in %immunizationsItems %}":
@@ -160,7 +159,7 @@ body:
               "{% if %proceduresSummary.exists() %}":
                 div: "{{ %proceduresSummary }}"
               "{% else %}":
-                div: "No procedures found"
+                div: "No summary provided"
             "{% if %proceduresItems.count() > 0 %}":
               entry:
                 "{% for index, procedureItem in %proceduresItems %}":
@@ -179,15 +178,20 @@ body:
     - "{% for index, problemItem in %problemItems %}":
         "{% assign %}":
           - problemId: "{{ %problemItem.item.where(linkId='condition-id').answer.valueString }}"
-          - problemCode: "{{ %problemItem.item.where(linkId.startsWith('condition-code')).answer.valueCoding }}"
+          - problemCodeAnswer: "{{ %problemItem.item.where(linkId='condition-code').answer }}"
+          - problemCode: "{{ %problemCodeAnswer.valueCoding | %problemCodeAnswer.valueString }}"
           - problemClinicalStatus: "{{ %problemItem.item.where(linkId.startsWith('condition-clinical-status')).answer.valueCoding }}"
           - problemVerificationStatus: "{{ %problemItem.item.where(linkId.startsWith('condition-verification-status')).answer.valueCoding }}"
           - problemCategory: "{[ %problemItem.item.where(linkId.startsWith('condition-category')).answer.valueCoding ]}"
-        "{% if %problemId.empty() and %problemCode.exists() %}":
-          fullUrl: "urn:uuid:Condition-{{ %index }}"
+        "{% if %problemCode.exists() %}":
+          fullUrl: "urn:uuid:Condition-{{ %problemId | %index }}"
           request:
-            method: POST
-            url: /Condition
+            "{% if %problemId.exists() %}":
+              method: PUT
+              url: /Condition/{{ %problemId }}
+            "{% else %}":
+              method: POST
+              url: /Condition
           resource:
             resourceType: Condition
             meta:
@@ -197,8 +201,11 @@ body:
               coding:
                 - "{{ %problemClinicalStatus }}"
             code:
-              coding:
-                - "{{ %problemCode }}"
+              "{% if %problemCode is String %}":
+                text: "{{ %problemCode }}"
+              "{% else %}":
+                coding:
+                  - "{{ %problemCode }}"
             verificationStatus:
               coding:
                 - "{{ %problemVerificationStatus }}"
@@ -210,19 +217,24 @@ body:
               reference: "Patient/{{ %patientId }}"
             text:
               status: generated
-              div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:Condition-{{%index}}</p><p><b>clinicalStatus</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/condition-clinical {{%problemClinicalStatus.code}}}'>{{%problemClinicalStatus.display}}</span></p><p><b>code</b>: <span title='Codes: {http://snomed.info/sct {{%problemCode.code}} }'>{{%problemCode.display}}</span></p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
+              div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:Condition-{{%index}}</p><p><b>clinicalStatus</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/condition-clinical {{%problemClinicalStatus.code}}}'>{{%problemClinicalStatus.display}}</span></p><p><b>code</b>: <span title='Diagnosis}'>{{%problemCode.display | %problemCode}}</span></p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
     - "{% for index, allergyItem in %allergiesItems %}":
         "{% assign %}":
           - allergyId: "{{ %allergyItem.item.where(linkId='allergy-id').answer.valueString }}"
-          - allergyCode: "{{ %allergyItem.item.where(linkId.startsWith('allergy-code')).answer.valueCoding }}"
+          - allergyCodeAnswer: "{{ %allergyItem.item.where(linkId='allergy-code').answer }}"
+          - allergyCode: "{{ %allergyCodeAnswer.valueCoding | %allergyCodeAnswer.valueString }}"
           - allergyClinicalStatus: "{{ %allergyItem.item.where(linkId.startsWith('allergy-clinical-status')).answer.valueCoding }}"
           - allergyVerificationStatus: "{{ %allergyItem.item.where(linkId.startsWith('allergy-verification-status')).answer.valueCoding }}"
           - allergyCategory: "{[ %allergyItem.item.where(linkId.startsWith('allergy-category')).answer.valueCoding.code ]}"
-        "{% if %allergyId.empty() and %allergyCode.exists() %}":
+        "{% if %allergyCode.exists() %}":
           fullUrl: "urn:uuid:AllergyIntolerance-{{ %index }}"
           request:
-            method: POST
-            url: /AllergyIntolerance
+            "{% if %allergyId.exists() %}":
+              method: PUT
+              url: /AllergyIntolerance/{{ %allergyId }}
+            "{% else %}":
+              method: POST
+              url: /AllergyIntolerance
           resource:
             resourceType: AllergyIntolerance
             meta:
@@ -232,8 +244,11 @@ body:
               coding:
                 - "{{ %allergyClinicalStatus }}"
             code:
-              coding:
-                - "{{ %allergyCode }}"
+              "{% if %allergyCode is String %}":
+                text: "{{ %allergyCode }}"
+              "{% else %}":
+                coding:
+                  - "{{ %allergyCode }}"
             verificationStatus:
               coding:
                 - "{{ %allergyVerificationStatus }}"
@@ -242,19 +257,23 @@ body:
               reference: "Patient/{{ %patientId }}"
             text:
               status: generated
-              div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:AllergyIntolerance-{{%index}}</p><p><b>clinicalStatus</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical {{%allergyClinicalStatus.code}}}'>{{%allergyClinicalStatus.display}}</span></p><p><b>code</b>: <span title='Codes: {http://snomed.info/sct {{%allergyCode.code}} }'>{{%allergyCode.display}}</span></p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
+              div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:AllergyIntolerance-{{%index}}</p><p><b>clinicalStatus</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical {{%allergyClinicalStatus.code}}}'>{{%allergyClinicalStatus.display}}</span></p><p><b>code</b>: <span title='Allergy or Intolerance}'>{{%allergyCode.display | %allergyCode}}</span></p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
     - "{% for index, medicationItem in %medicationsItems %}":
         "{% assign %}":
-          - medicationId: "{{ %medicationItem.item.where(linkId='medication-statement-id').answer.valueString }}"
+          - medicationStatementId: "{{ %medicationItem.item.where(linkId='medication-statement-id').answer.valueString }}"
           - medicationReference: "{{ %medicationItem.item.where(linkId.startsWith('medication-medication')).answer.valueReference }}"
           - medicationStatus: "{{ %medicationItem.item.where(linkId.startsWith('medication-status')).answer.valueCoding.code }}"
           - medicationStatusReason: "{[ %medicationItem.item.where(linkId.startsWith('medication-status-reason')).answer.valueCoding.code ]}"
           - medicationEffectiveDateTime: "{{ %medicationItem.item.where(linkId.startsWith('medication-effective-datetime')).answer.valueDateTime }}"
-        "{% if %medicationId.empty() and %medicationReference.exists() %}":
+        "{% if %medicationReference.exists() %}":
           fullUrl: "urn:uuid:MedicationStatement-{{ %index }}"
           request:
-            method: POST
-            url: /MedicationStatement
+            "{% if %medicationStatementId.exists() %}":
+              method: PUT
+              url: /MedicationStatement/{{ %medicationStatementId }}
+            "{% else %}":
+              method: POST
+              url: /MedicationStatement
           resource:
             resourceType: MedicationStatement
             meta:
@@ -278,41 +297,54 @@ body:
     - "{% for index, immunizationItem in %immunizationsItems %}":
         "{% assign %}":
           - immunizationId: "{{ %immunizationItem.item.where(linkId='immunization-id').answer.valueString }}"
-          - immunizationVaccineCode: "{{ %immunizationItem.item.where(linkId.startsWith('immunization-vaccine-code')).answer.valueCoding }}"
+          - immunizationVaccineCodeAnswer: "{{ %immunizationItem.item.where(linkId='immunization-vaccine-code').answer }}"
+          - immunizationVaccineCode: "{{ %immunizationVaccineCodeAnswer.valueCoding | %immunizationVaccineCodeAnswer.valueString }}"
           - immunizationStatus: "{{ %immunizationItem.item.where(linkId.startsWith('immunization-status')).answer.valueCoding.code }}"
           - immunizationDate: "{{ %immunizationItem.item.where(linkId.startsWith('immunization-occurrence-datetime')).answer.valueDateTime }}"
-        "{% if %immunizationId.empty() and %immunizationVaccineCode.exists() %}":
+        "{% if %immunizationVaccineCode.exists() %}":
           fullUrl: "urn:uuid:Immunization-{{ %index }}"
           request:
-            method: POST
-            url: /Immunization
+            "{% if %immunizationId.exists() %}":
+              method: PUT
+              url: /Immunization/{{ %immunizationId }}
+            "{% else %}":
+              method: POST
+              url: /Immunization
           resource:
             resourceType: Immunization
             meta:
               profile:
                 - "http://hl7.org/fhir/uv/ips/StructureDefinition/Immunization-uv-ips"
             status: "{{ %immunizationStatus }}"
             vaccineCode:
-              coding:
-                - "{{ %immunizationVaccineCode }}"
+              "{% if %immunizationVaccineCode is String %}":
+                text: "{{ %immunizationVaccineCode }}"
+              "{% else %}":
+                coding:
+                  - "{{ %immunizationVaccineCode }}"
             occurrenceDateTime: "{{ %immunizationDate }}"
             patient:
               reference: "Patient/{{ %patientId }}"
             "{% if %immunizationDate.exists() %}":
               text:
                 status: generated
-                div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:Immunization-{{%index}}</p><p><b>status</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/immunization-status {{%immunizationStatus}}}'>{{%immunizationStatus}}</span></p><p><b>vaccineCode</b>: <span title='Codes: {http://snomed.info/sct {{%immunizationVaccineCode.code}} }'>{{%immunizationVaccineCode.display}}</span></p><p><b>occurrenceDateTime</b>: {{%immunizationDate}}</p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
+                div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:Immunization-{{%index}}</p><p><b>status</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/immunization-status {{%immunizationStatus}}}'>{{%immunizationStatus}}</span></p><p><b>vaccine</b>: <span title='Vaccine}'>{{%immunizationVaccineCode.display | %immunizationVaccineCode}}</span></p><p><b>occurrenceDateTime</b>: {{%immunizationDate}}</p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
     - "{% for index, procedureItem in %proceduresItems %}":
         "{% assign %}":
           - procedureId: "{{ %procedureItem.item.where(linkId='procedure-id').answer.valueString }}"
-          - procedureCode: "{{ %procedureItem.item.where(linkId.startsWith('procedure-code')).answer.valueCoding }}"
+          - procedureCodeAnswer: "{{ %procedureItem.item.where(linkId='procedure-code').answer }}"
+          - procedureCode: "{{ %procedureCodeAnswer.valueCoding | %procedureCodeAnswer.valueString }}"
           - procedureStatus: "{{ %procedureItem.item.where(linkId.startsWith('procedure-status')).answer.valueCoding.code }}"
           - procedurePerformedDateTime: "{{ %procedureItem.item.where(linkId.startsWith('procedure-performed-datetime')).answer.valueDateTime }}"
-        "{% if %procedureId.empty() and %procedureCode.exists() %}":
+        "{% if %procedureCode.exists() %}":
           fullUrl: "urn:uuid:Procedure-{{ %index }}"
           request:
-            method: POST
-            url: /Procedure
+            "{% if %procedureId.exists() %}":
+              method: PUT
+              url: /Procedure/{{ %procedureId }}
+            "{% else %}":
+              method: POST
+              url: /Procedure
           resource:
             resourceType: Procedure
             meta:
@@ -321,10 +353,13 @@ body:
             status: "{{ %procedureStatus }}"
             performedDateTime: "{{ %procedurePerformedDateTime }}"
             code:
-              coding:
-                - "{{ %procedureCode }}"
+              "{% if %procedureCode is String %}":
+                text: "{{ %procedureCode }}"
+              "{% else %}":
+                coding:
+                  - "{{ %procedureCode }}"
             subject:
               reference: "Patient/{{ %patientId }}"
             text:
               status: generated
-              div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:Procedure-{{%index}}</p><p><b>status</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/procedure-status {{%procedureStatus}}}'>{{%procedureStatus}}</span></p><p><b>code</b>: <span title='Codes: {http://snomed.info/sct {{%procedureCode.code}} }'>{{%procedureCode.display}}</span></p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"
+              div: "<div xmlns='http://www.w3.org/1999/xhtml'><p><b>Generated Narrative</b></p><p><b>identifier</b>: id: urn:uuid:Procedure-{{%index}}</p><p><b>status</b>: <span title='Codes: {http://terminology.hl7.org/CodeSystem/procedure-status {{%procedureStatus}}}'>{{%procedureStatus}}</span></p><p><b>code</b>: <span title='Procedure}'>{{%procedureCode.display | %procedureCode}}</span></p><p><b>subject</b>: <a href='#Patient_{{%patientId}}'>See above (Patient/{{%patientId}})</a></p></div>"