Merge branch 'main' of https://github.com/openmrs/openmrs-esm-patient…

…-management into patient-registration
openmrs · Jul 9, 2023 · bc9d91a · bc9d91a
2 parents 2b0a5e5 + 2d15566
commit bc9d91a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.resource.ts b/packages/esm-outpatient-app/src/active-visits/active-visits-table.resource.ts
@@ -253,9 +253,7 @@ export function useVisitQueueEntries(currServiceName: string, locationUuid: stri
       ?.map(mapVisitQueueEntryProperties)
       .filter((data) => dayjs(data.visitStartDateTime).isToday());
   } else {
-    mappedVisitQueueEntries = data?.data?.results
-      ?.map(mapVisitQueueEntryProperties)
-      .filter((data) => data.service === currServiceName && dayjs(data.visitStartDateTime).isToday());
+    mappedVisitQueueEntries = data?.data?.results?.map(mapVisitQueueEntryProperties);
   }
 
   return {
@@ -349,9 +347,7 @@ export function useServiceQueueEntries(service: string, locationUuid: string) {
     patientUuid: visitQueueEntry.queueEntry ? visitQueueEntry?.queueEntry.uuid : '--',
   });
 
-  const mappedServiceQueueEntries = data?.data?.results
-    ?.map(mapServiceQueueEntryProperties)
-    .filter(({ returnDate }) => dayjs(returnDate).isToday());
+  const mappedServiceQueueEntries = data?.data?.results?.map(mapServiceQueueEntryProperties);
 
   return {
     serviceQueueEntries: mappedServiceQueueEntries ? mappedServiceQueueEntries : [],