return only laborders

METS-Programme · Jun 25, 2024 · 32ca35d · 32ca35d
1 parent 4df82e2
commit 32ca35d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/...ent-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx b/...ent-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
@@ -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
@@ -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);