Merge to upgrade demo changes

ig-template/package/content/assets/css/ips-viewer.css

@@ -44,8 +44,47 @@ ul {
 
   }
 
+  .diagnostic {
+
+    background: #e5cffa;
+
+  }
+
+  .results {
+
+    background: #d6aeff;
+
+  }
 
+  .vs {
+
+    background: #ffaed4;
+
+  }
+  .vital {
+
+    background: #fbdcea;
+
+  }
 
+  .nonumbers::before {
+    content: "" !important;
+  }
+
+
+  .socialhistory {
+
+    background: #ffdfae;
+
+  }
+
+  .socialhistoryitem {
+
+    background: #f7ecdc;
+
+  }
+
+
   .patient {
 
     background: #f1e2f5;

ig-template/package/includes/ips.liquid

@@ -36,13 +36,11 @@
     {{ pat.birthDate }}<br/>{% endif %}
 
 </div>
-<br/>
-<h3>Sections:</h3>
-<br/>
+<h3 class="nonumbers">Sections</h3>
 
 
 {% for sec in composition.section %}
-  <h4>{{ sec.title }}</h4>
+  <h4 class="nonumbers">{{ sec.title }}</h4>
 
   {% if sec.title == "Allergies and Intolerances" %}
     {% assign allergies = bundle.entry | where: "resource.resourceType", "AllergyIntolerance" %}
@@ -168,4 +166,184 @@
   {% endif %}
 
 
+  {% if sec.title == "Relevant diagnostic tests &/or laboratory data" %}
+
+    <div class="results block">
+
+    {% for obsrid in sec.entry %}
+      {% if  obsrid.reference contains "Observation" %}
+      {% assign obsid = obsrid.reference | replace: 'Observation/', '' %}
+
+      {% assign obsr = bundle.entry | where: "resource.id", obsid | first %}
+
+
+          {% assign obs = obsr.resource %}
+          <div class="diagnostic indent block">
+            <b>Observation:</b>
+            {{ obs.code.text }} <br/>
+
+
+          {% if obs.status %}
+            <b>Status:</b>
+            {{ obs.status }} <br/>{% endif %}
+
+            {% if obs.issued %}
+              <b>Issued:</b>
+              {{ obs.issued }} <br/>{% endif %}
+
+              {% if obs.valueQuantity %}
+                <b>Result:</b>
+              {{ obs.valueQuantity.value }}  {{obs.valueQuantity.unit}} {% if obs.interpretation[0].coding[0].display %} ({{obs.interpretation[0].coding[0].display}}){% endif %} {% if obs.referenceRange[0].low %} [{{obs.referenceRange[0].low.value}} {{obs.referenceRange[0].low.unit}}-{{obs.referenceRange[0].high.value}} {{obs.referenceRange[0].high.unit}}]{% endif %}<br/>{% endif %}
+                {% if obs.component %}
+                  <b>Result:</b>
+
+                  {% for comp in obs.component %}
+                    {% if comp.valueInteger %}
+                      {{ comp.code.text }} || {{comp.valueInteger}} <br/>{% endif %}
+                      {% if comp.valueQuantity %}
+                        <br/>
+                      {{ comp.code.text }} || {{ comp.valueQuantity.value }}  {{comp.valueQuantity.unit}} {% endif %}
+
+                    {% endfor %}
+
+              {% endif %}
+
+
+              </div>
+            {% endif %}
+
+            {% if  obsrid.reference contains "DocumentReference" %}
+
+              {% assign obsid = obsrid.reference | replace: 'DocumentReference/', '' %}
+
+              {% assign obsr = bundle.entry | where: "resource.id", obsid | first %}
+
+
+                  {% assign obs = obsr.resource %}
+                  <div class="diagnostic indent block">
+                    <b>Document Reference:</b>
+                    {{ obs.category[0].text }} <br/>
+
+
+                  {% if obs.status %}
+                    <b>Status:</b>
+                    {{ obs.status }} <br/>{% endif %}
+
+                    {% if obs.date %}
+                      <b>Date:</b>
+                      {{ obs.date }} <br/>{% endif %}
+
+
+
+
+                      </div>
+
+            {% endif %}
+
+            {% endfor %}
+          </div>
+  {% endif %}
+
+
+  {% if sec.title == "Vital signs" %}
+
+    <div class="vs block">
+
+    {% for obsrid in sec.entry %}
+
+      {% assign obsid = obsrid.reference | replace: 'Observation/', '' %}
+
+      {% assign obsr = bundle.entry | where: "resource.id", obsid | first %}
+
+
+          {% assign obs = obsr.resource %}
+          <div class="vital indent block">
+            <b>Code:</b>
+            {{ obs.code.text }} <br/>
+
+
+          {% if obs.status %}
+            <b>Status:</b>
+            {{ obs.status }} <br/>{% endif %}
+
+            {% if obs.issued %}
+              <b>Issued:</b>
+              {{ obs.issued }} <br/>{% endif %}
+
+              {% if obs.valueQuantity %}
+                <b>Result:</b>
+              {{ obs.valueQuantity.value }}  {{obs.valueQuantity.unit}} {% if obs.interpretation[0].coding[0].display %} ({{obs.interpretation[0].coding[0].display}}){% endif %} {% if obs.referenceRange[0].low %} [{{obs.referenceRange[0].low.value}} {{obs.referenceRange[0].low.unit}}-{{obs.referenceRange[0].high.value}} {{obs.referenceRange[0].high.unit}}]{% endif %}<br/>{% endif %}
+                {% if obs.component %}
+                  <b>Result:</b>
+
+                  {% for comp in obs.component %}
+                    {% if comp.valueInteger %}
+                      {{ comp.code.text }} || {{comp.valueInteger}} <br/>{% endif %}
+                      {% if comp.valueQuantity %}
+                        <br/>
+                      {{ comp.code.text }} || {{ comp.valueQuantity.value }}  {{comp.valueQuantity.unit}} {% endif %}
+
+                    {% endfor %}
+
+            {% endif %}
+
+              </div>
+
+            {% endfor %}
+          </div>
+  {% endif %}
+
+
+  {% if sec.title == "Social history Narrative" %}
+
+    <div class="socialhistory block">
+
+    {% for obsrid in sec.entry %}
+
+      {% assign obsid = obsrid.reference | replace: 'Observation/', '' %}
+
+      {% assign obsr = bundle.entry | where: "resource.id", obsid | first %}
+
+
+          {% assign obs = obsr.resource %}
+          <div class="socialhistoryitem indent block">
+            <b>Code:</b>
+            {{ obs.code.text }} <br/>
+
+
+          {% if obs.status %}
+            <b>status:</b>
+            {{ obs.status }} <br/>{% endif %}
+
+            {% if obs.issued %}
+              <b>issued:</b>
+              {{ obs.issued }} <br/>{% endif %}
+
+              {% if obs.valueQuantity %}
+                <b>Result:</b>
+              {{ obs.valueQuantity.value }}  {{obs.valueQuantity.unit}} {% if obs.interpretation[0].coding[0].display %} ({{obs.interpretation[0].coding[0].display}}){% endif %} {% if obs.referenceRange[0].low %} [{{obs.referenceRange[0].low.value}} {{obs.referenceRange[0].low.unit}}-{{obs.referenceRange[0].high.value}} {{obs.referenceRange[0].high.unit}}]{% endif %}<br/>{% endif %}
+                {% if obs.component %}
+                  <b>Result:</b>
+
+            {% for comp in obs.component %}
+              <br/>
+
+              {% if comp.valueInteger %}
+                {{ comp.code.text }} || {{comp.valueInteger}} <br/>{% endif %}
+                {% if comp.valueQuantity %}
+
+                {{ comp.code.text }} || {{ comp.valueQuantity.value }}  {{comp.valueQuantity.unit}} {% endif %}
+
+              {% endfor %}
+
+            {% endif %}
+
+
+              </div>
+
+            {% endfor %}
+          </div>
+  {% endif %}
+
+
 {% endfor %}

input/fsh/aliases.fsh

@@ -23,6 +23,7 @@ Alias: $phpid = https://www.who-umc.org/phpid
 Alias: $gs1 = https://www.gs1.org/gtin
 Alias: $absent-unknown-uv-ips = http://hl7.org/fhir/uv/ips/CodeSystem/absent-unknown-uv-ips
 
+Alias: $list-empty-reason = http://terminology.hl7.org/CodeSystem/list-empty-reason
 
 
 // =========== Extensions =======

input/fsh/examples/Alicia.fsh

@@ -181,7 +181,7 @@ Overweight
 * identifier[0].system = "https://www.gravitatehealth.eu/sid/doc"
 * identifier[=].value = "alicia-1"
 * identifier[+].system = "keycloak-id"
-* identifier[=].value = "2a59b833-7132-4d53-b1c3-78710145f0a1"
+* identifier[=].value = "31297ad1-cb3c-4138-a132-e64016170e1d"
 * active = true
 * name.family = "Gravitate"
 * name.given = "Alicia"

input/fsh/examples/IPS-1.fsh

@@ -87,7 +87,7 @@ Usage: #inline
 	Maria Gravitate, Female, 75 years old (1946-05-05)
 </div>"
 * identifier[0].system = "https://www.gravitatehealth.eu/sid/doc"
-* identifier[=].value = "maria-1"
+* identifier[=].value = "ips-1"
 * active = true
 * name.family = "Gravitate"
 * name.given = "IPS"

input/fsh/examples/IPS-4.fsh

@@ -53,8 +53,8 @@ Description: "Example of International Patient Summary for Gravitate"
 * entry[=].resource = bh
 
 
-* entry[+].fullUrl = "https://myserver.org/Observation/bp" // BP (Observation)
-* entry[=].resource = bp
+* entry[+].fullUrl = "https://myserver.org/Observation/ips4-bp" // BP (Observation)
+* entry[=].resource = ips4-bp
 
 * entry[+].fullUrl = "https://myserver.org/Observation/glucose" // Glucose (Observation)
 * entry[=].resource = glucose
@@ -101,7 +101,7 @@ Usage: #inline
 * section[=].code = $loinc#8716-3 "Vital Signs"
 * section[=].entry[+] = Reference(bw) "Body weight"
 * section[=].entry[+] = Reference(bh) "Body height"
-* section[=].entry[+] = Reference(bp) "Blood pressure"
+* section[=].entry[+] = Reference(ips4-bp) "Blood pressure"
 
 
 // ======== Results
@@ -343,7 +343,7 @@ Usage: #inline
 
 * valueQuantity = 170 'cm'
 
-Instance: bp
+Instance: ips4-bp
 InstanceOf: Observation
 Usage: #inline
 

input/fsh/examples/Pedro.fsh

@@ -164,7 +164,7 @@ Depression
 * identifier[0].system = "https://www.gravitatehealth.eu/sid/doc"
 * identifier[=].value = "Pedro-1"
 * identifier[+].system = "keycloak-id"
-* identifier[=].value = "b951ba0c-9a89-4c3e-9f6a-c1f40d9279b2"
+* identifier[=].value = "b17f0a96-cb4a-45cd-be09-cbadbe428948"
 * active = true
 * name.family = "Gravitate"
 * name.given = "Pedro"