Fix effectivePeriod.start check in resource templates

uwcirg · May 14, 2024 · d75f0d5 · d75f0d5
1 parent 940919e
commit d75f0d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/lib/resource-templates/DiagnosticReport.svelte b/src/lib/resource-templates/DiagnosticReport.svelte
@@ -16,8 +16,8 @@
     <strong>{resource.code.text}</strong><br>
   {/if}
 {/if}
-{#if resource.effectivePeriod}
-    Effective {resource.effectivePeriod.start}{resource.effectivePeriod.end
+{#if resource.effectivePeriod?.start}
+  Effective {resource.effectivePeriod.start}{resource.effectivePeriod.end
     ? ` - ${resource.effectivePeriod.end}`
     : ''}
 {:else if resource.effectiveDateTime}

diff --git a/src/lib/resource-templates/MedicationStatement.svelte b/src/lib/resource-templates/MedicationStatement.svelte
@@ -22,8 +22,10 @@
 {#if resource.resourceReference && resource.resourceReference.display}
   {resource.resourceReference.display}<br>
 {/if}
-{#if resource.effectivePeriod}
-  Effective period: {resource.effectivePeriod.start.split("T")[0]} - {resource.effectivePeriod.end.split("T")[0] ?? "*"}
+{#if resource.effectivePeriod?.start}
+  Effective {resource.effectivePeriod.start}{resource.effectivePeriod.end
+    ? ` - ${resource.effectivePeriod.end}`
+    : ''}
 {:else if resource.effectiveDateTime}
   {resource.effectiveDateTime ? `Effective date: ${resource.effectiveDateTime.split("T")[0]}` : ''}
 {/if}