Merge branch 'master' into 354-generic-resource-list

beda-software · Dec 18, 2024 · 2499307 · 2499307
2 parents 2d33024 + f63914d
commit 2499307
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/containers/PatientDetails/PatientOverviewDynamic/components/StandardCard/prepare.tsx b/src/containers/PatientDetails/PatientOverviewDynamic/components/StandardCard/prepare.tsx
@@ -15,7 +15,7 @@ import {
 } from 'fhir/r4b';
 import _ from 'lodash';
 import moment from 'moment';
-import { extractExtension, fromFHIRReference } from 'sdc-qrf';
+import { extractExtension } from 'sdc-qrf';
 
 import { WithId, extractBundleResources, formatFHIRDate, parseFHIRDateTime } from '@beda.software/fhir-react';
 
@@ -281,12 +281,14 @@ export function prepareAppointmentDetails(appointment: Appointment) {
     ];
 
     //TODO agree on terminology for Appointment.particioant.type and use it
-    const participants = appointment.participant.filter(p => p.type?.[0]?.coding?.[0]?.code !== 'patient').map(participant => ({
-        title: participant.type?.[0]?.text,
-        value: participant.actor?.display,
-    }))
+    const participants = appointment.participant
+        .filter((p) => p.type?.[0]?.coding?.[0]?.code !== 'patient')
+        .map((participant) => ({
+            title: participant.type?.[0]?.text,
+            value: participant.actor?.display,
+        }));
 
-    return [...appointmentDetails, ...participants]
+    return [...appointmentDetails, ...participants];
 }
 
 export function prepareServiceRequest(

diff --git a/src/utils/fhirpath.ts b/src/utils/fhirpath.ts
@@ -33,11 +33,11 @@ type NonEmptyArray<T> = [T, ...T[]];
 export function compileAsArray<SRC, DST = unknown, REQ = false>(expression: string) {
     const path = fhirpath.compile(expression);
 
-    return (s: SRC) => path(s) as REQ extends true ? NonEmptyArray<DST> : Array<DST>;
+    return (s: SRC, context?: Context | undefined) => path(s, context) as REQ extends true ? NonEmptyArray<DST> : Array<DST>;
 }
 
 export function compileAsFirst<SRC, DST = unknown, REQ = false>(expression: string) {
     const path = fhirpath.compile(expression);
 
-    return (s: SRC) => path(s)[0] as REQ extends true ? DST : DST | undefined;
+    return (s: SRC, context?: Context | undefined) => path(s, context)[0] as REQ extends true ? DST : DST | undefined;
 }