diff --git a/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx b/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx index e959ad0..a357349 100644 --- a/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx +++ b/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx @@ -111,12 +111,13 @@ const LaboratoryActiveTestOrderResults: React.FC< encounterTypeUuid === laboratoryEncounterTypeUuid || encounterTypeUuid === artCardEncounterTypeUuid; - // Check if any order has a matching orderType UUID - const hasMatchingOrder = orders?.some( + // Filter orders to only include those with the matching orderType UUID + const matchingOrders = orders?.filter( ({ orderType }) => orderType?.uuid === laboratoryOrderTypeUuid ); - return isMatchingEncounterType && hasMatchingOrder; + // Return the item only if it has matching encounterType and at least one matching order + return isMatchingEncounterType && matchingOrders?.length > 0; }) ?.sort((a, b) => { const dateA = new Date(a.encounterDatetime); diff --git a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx index 9890708..8253a2b 100644 --- a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx +++ b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx @@ -121,12 +121,13 @@ const LaboratoryOrderReferalResults: React.FC< encounterTypeUuid === laboratoryEncounterTypeUuid || encounterTypeUuid === artCardEncounterTypeUuid; - // Check if any order has a matching orderType UUID - const hasMatchingOrder = orders?.some( + // Filter orders to only include those with the matching orderType UUID + const matchingOrders = orders?.filter( ({ orderType }) => orderType?.uuid === laboratoryOrderTypeUuid ); - return isMatchingEncounterType && hasMatchingOrder; + // Return the item only if it has matching encounterType and at least one matching order + return isMatchingEncounterType && matchingOrders?.length > 0; }) ?.sort((a, b) => { const dateA = new Date(a.encounterDatetime); diff --git a/src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.component.tsx b/src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.component.tsx index 5d693f3..dc8cc78 100644 --- a/src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.component.tsx +++ b/src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.component.tsx @@ -106,12 +106,13 @@ const LaboratoryPastTestOrderResults: React.FC< encounterTypeUuid === laboratoryEncounterTypeUuid || encounterTypeUuid === artCardEncounterTypeUuid; - // Check if any order has a matching orderType UUID - const hasMatchingOrder = orders?.some( + // Filter orders to only include those with the matching orderType UUID + const matchingOrders = orders?.filter( ({ orderType }) => orderType?.uuid === laboratoryOrderTypeUuid ); - return isMatchingEncounterType && hasMatchingOrder; + // Return the item only if it has matching encounterType and at least one matching order + return isMatchingEncounterType && matchingOrders?.length > 0; }) ?.sort((a, b) => { const dateA = new Date(a.encounterDatetime);