@kenyaemr/esm-express-workflow-app 5.4.3 → 5.4.4-pre.100

package/src/components/mch/mch.triage.component.tsx

@@ -5,13 +5,14 @@ import { ErrorState, useConfig } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { useQueues } from '../../hooks/useServiceQueues';
 import QueueTab from '../../shared/queue/queue-tab.component';
+import QueueSummaryCards, { QueueSummaryCard } from '../../shared/queue/queue-summary-cards.component';
 import { Queue, QueueFilter } from '../../types';
 import { useTriageQueuesMetrics } from '../triage/triage.resource';
 import { ExpressWorkflowConfig } from '../../config-schema';
 
 const MCHTriage: React.FC = () => {
   const { t } = useTranslation();
-  const { queues, isLoading, error } = useQueues();
+  const { queues, isLoading: isLoadingQueues, error } = useQueues();
   const [currQueue, setCurrQueue] = useState<Queue>();
   const [filters, setFilters] = useState<Array<QueueFilter>>([]);
   const {
@@ -31,11 +32,15 @@ const MCHTriage: React.FC = () => {
   const {
     error: metricsError,
     isLoading: isLoadingMetrics,
-    attendedtoEntries,
+    attendedToEntries,
     waitingEntries,
+    isValidating: isValidatingMetrics,
   } = useTriageQueuesMetrics(activeQueue);
 
-  if (isLoading || isLoadingMetrics) {
+  const isLoading = isLoadingQueues || isLoadingMetrics;
+  const isValidating = isValidatingMetrics;
+
+  if (isLoading && !isValidating) {
     return <InlineLoading description={t('loadingQueues', 'Loading queues...')} />;
   }
 
@@ -43,37 +48,41 @@ const MCHTriage: React.FC = () => {
     return <ErrorState error={error ?? metricsError} headerTitle={t('errorLoadingQueues', 'Error loading queues')} />;
   }
 
+  const cards: Array<QueueSummaryCard> = [
+    {
+      title: t('patientsAwaiting', 'Patient awaiting'),
+      value: waitingEntries?.length?.toString(),
+      onClick: () => {
+        setFilters((prevFilters) => [
+          ...prevFilters.filter((f) => f.key !== 'status'),
+          { key: 'status', value: waitingStatus, label: t('waiting', 'Waiting') },
+        ]);
+      },
+    },
+    {
+      title: t('patientAttended', 'Patient attended to'),
+      value: attendedToEntries?.length?.toString(),
+      onClick: () => {
+        setFilters((prevFilters) => [
+          ...prevFilters.filter((f) => f.key !== 'status'),
+          { key: 'status', value: `${finishedStatus},${inServiceStatus}`, label: t('attendedTo', 'Attended to') },
+        ]);
+      },
+    },
+  ];
+
   return (
-    <QueueTab
-      queues={triageQueues}
-      navigatePath="mch"
-      cards={[
-        {
-          title: t('patientsAwaiting', 'Patient awaiting'),
-          value: waitingEntries?.length?.toString(),
-          onClick: () => {
-            setFilters((prevFilters) => [
-              ...prevFilters.filter((f) => f.key !== 'status'),
-              { key: 'status', value: waitingStatus, label: t('waiting', 'Waiting') },
-            ]);
-          },
-        },
-        {
-          title: t('patientAttended', 'Patient attended to'),
-          value: attendedtoEntries?.length?.toString(),
-          onClick: () => {
-            setFilters((prevFilters) => [
-              ...prevFilters.filter((f) => f.key !== 'status'),
-              { key: 'status', value: `${finishedStatus},${inServiceStatus}`, label: t('attendedTo', 'Attended to') },
-            ]);
-          },
-        },
-      ]}
-      onTabChanged={setCurrQueue}
-      usePatientChart
-      filters={filters}
-      onFiltersChanged={setFilters}
-    />
+    <>
+      <QueueSummaryCards cards={cards} />
+      <QueueTab
+        queues={triageQueues}
+        navigatePath="mch"
+        onTabChanged={setCurrQueue}
+        usePatientChart
+        filters={filters}
+        onFiltersChanged={setFilters}
+      />
+    </>
   );
 };
 

package/src/components/pharmacy/index.ts

@@ -1,10 +1,6 @@
-import { getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
+import { getAsyncLifecycle } from '@openmrs/esm-framework';
 
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import { moduleName } from '../../constants';
-import { createLeftPanelLink } from '../../shared/dashboard-link/dashboard-link.component';
-import PharmacyTabs from './pharmacy-tabs.component';
-import Pharmacy from './pharmacy.component';
 
 const options = {
   featureName: 'express-workflow',
@@ -12,23 +8,29 @@ const options = {
 };
 
 // t('pharmacy', 'Pharmacy')
-export const pharmacyLink = getSyncLifecycle(
-  createLeftPanelLink({
-    name: 'pharmacy',
-    title: 'pharmacy',
-  }),
+export const pharmacyLink = getAsyncLifecycle(
+  () =>
+    import('../../shared/dashboard-link/dashboard-link.component').then((m) => ({
+      default: m.createLeftPanelLink({
+        name: 'pharmacy',
+        title: 'pharmacy',
+      }),
+    })),
   options,
 );
-export const pharmacy = getSyncLifecycle(Pharmacy, options);
-export const pharmacyTabs = getSyncLifecycle(PharmacyTabs, options);
+export const pharmacy = getAsyncLifecycle(() => import('./pharmacy.component'), options);
+export const pharmacyTabs = getAsyncLifecycle(() => import('./pharmacy-tabs.component'), options);
 
 // t('precription', 'Prescription')
-export const pharmacyPatientChartDashboardLink = getSyncLifecycle(
-  createDashboardLink({
-    path: 'pharmacy',
-    title: 'prescription',
-    icon: 'omrs-icon-medication',
-  }),
+export const pharmacyPatientChartDashboardLink = getAsyncLifecycle(
+  () =>
+    import('@openmrs/esm-patient-common-lib').then((m) => ({
+      default: m.createDashboardLink({
+        path: 'pharmacy',
+        title: 'prescription',
+        icon: 'omrs-icon-medication',
+      }),
+    })),
   options,
 );
 export const pharmacyOrders = getAsyncLifecycle(() => import('./orders/pharmacy-orders.component'), options);

package/src/components/pharmacy/orders/pharmacy-orders.component.tsx

@@ -18,12 +18,20 @@ import {
 } from '@carbon/react';
 import { Add, Renew } from '@carbon/react/icons';
 import { ErrorState, formatDatetime, parseDate, useDebounce, useLayoutType } from '@openmrs/esm-framework';
-import { EmptyState, useLaunchWorkspaceRequiringVisit, usePaginationInfo } from '@openmrs/esm-patient-common-lib';
+import {
+  EmptyState,
+  invalidateVisitAndEncounterData,
+  invalidateVisitByUuid,
+  useLaunchWorkspaceRequiringVisit,
+  usePaginationInfo,
+  usePatientChartStore,
+} from '@openmrs/esm-patient-common-lib';
 import capitalize from 'lodash-es/capitalize';
 
 import { usePharmacyOrders } from './pharmacy-orders.resource';
 
 import styles from './pharmacy-orders.scss';
+import { useSWRConfig } from 'swr';
 
 type PharmacyOrdersProps = {
   patient: fhir.Patient;
@@ -36,18 +44,28 @@ const PharmacyOrders: React.FC<PharmacyOrdersProps> = ({ patient }) => {
   const debouncedSearchTerm = useDebounce(searchTerm, 500);
   const { medicationRequests, isLoading, error, mutate, currentPage, goTo, totalCount, currPageSize, setCurrPageSize } =
     usePharmacyOrders(patient.identifier[0]?.value ?? '', debouncedSearchTerm);
-  const launchAddDrugOrder = useLaunchWorkspaceRequiringVisit('add-drug-order');
+  const { mutate: globalMutate } = useSWRConfig();
+
+  const { visitContext } = usePatientChartStore(patient.id);
+  const groupProps = useMemo(
+    () => ({
+      patient,
+      patientUuid: patient?.id,
+      visitContext: visitContext,
+      mutateVisitContext: () => {
+        invalidateVisitByUuid(globalMutate, visitContext.uuid);
+        invalidateVisitAndEncounterData(globalMutate, patient.id);
+      },
+    }),
+    [globalMutate, visitContext, patient.id],
+  );
+  const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patient?.id, 'order-basket');
 
   const currentItems = useMemo(() => {
     return medicationRequests.length;
   }, [medicationRequests]);
 
-  const { pageSizes, itemsDisplayed } = usePaginationInfo(
-    currPageSize,
-    totalCount || 0,
-    currentPage || 1,
-    currentItems,
-  );
+  const { pageSizes } = usePaginationInfo(currPageSize, totalCount || 0, currentPage || 1, currentItems);
 
   const header = [
     { key: 'date', header: t('dateAndTime', 'Date and time') },
@@ -58,7 +76,7 @@ const PharmacyOrders: React.FC<PharmacyOrdersProps> = ({ patient }) => {
   ];
 
   const rows = medicationRequests.map((medicationRequest) => {
-    const resource = medicationRequest.resource as fhir.MedicationRequest;
+    const resource = medicationRequest.resource;
     return {
       id: medicationRequest.fullUrl,
       date: formatDatetime(parseDate(resource?.authoredOn), { mode: 'standard', noToday: true }),
@@ -89,9 +107,9 @@ const PharmacyOrders: React.FC<PharmacyOrdersProps> = ({ patient }) => {
     return (
       <div className={styles.pharmacyOrdersContainer}>
         <EmptyState
-          displayText={t('noMedicationOrdersFound', 'No medication orders found')}
-          headerTitle={t('noMedicationOrders', 'No medication orders')}
-          launchForm={launchAddDrugOrder}
+          displayText={t('noMedicationOrdersFound', 'medication orders found')}
+          headerTitle={t('medicationOrders', 'Medication Orders')}
+          launchForm={() => launchOrderBasket({}, { encounterUuid: '' }, groupProps)}
         />
       </div>
     );
@@ -118,7 +136,11 @@ const PharmacyOrders: React.FC<PharmacyOrdersProps> = ({ patient }) => {
                 <Button kind="ghost" renderIcon={Renew} size={responseSize} onClick={() => mutate()}>
                   {t('refresh', 'Refresh')}
                 </Button>
-                <Button size={responseSize} onClick={() => launchAddDrugOrder()} kind="ghost" renderIcon={Add}>
+                <Button
+                  size={responseSize}
+                  onClick={() => launchOrderBasket({}, { encounterUuid: '' }, groupProps)}
+                  kind="ghost"
+                  renderIcon={Add}>
                   {t('addMedicationOrder', 'Add Medication Order')}
                 </Button>
               </TableToolbarContent>

package/src/components/pharmacy/orders/pharmacy-orders.test.tsx

@@ -1,21 +1,22 @@
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { vi, type MockedFunction } from 'vitest';
 import { renderWithSwr } from '../../../../../../tools/test-helpers';
 import PharmacyOrders from './pharmacy-orders.component';
 import { usePharmacyOrders } from './pharmacy-orders.resource';
 
 // Mock the workspace launcher hook
-const mockLaunchAddDrugOrder = jest.fn();
-jest.mock('@openmrs/esm-patient-common-lib', () => ({
-  ...jest.requireActual('@openmrs/esm-patient-common-lib'),
-  useLaunchWorkspaceRequiringVisit: jest.fn(() => mockLaunchAddDrugOrder),
+const mockLaunchAddDrugOrder = vi.fn();
+vi.mock('@openmrs/esm-patient-common-lib', () => ({
+  ...vi.importActual<typeof import('@openmrs/esm-patient-common-lib')>('@openmrs/esm-patient-common-lib'),
+  useLaunchWorkspaceRequiringVisit: vi.fn(() => mockLaunchAddDrugOrder),
 }));
 
 // Mock the pharmacy orders hook
-jest.mock('./pharmacy-orders.resource');
+vi.mock('./pharmacy-orders.resource');
 
-const mockUsePharmacyOrders = usePharmacyOrders as jest.MockedFunction<typeof usePharmacyOrders>;
+const mockUsePharmacyOrders = usePharmacyOrders as MockedFunction<typeof usePharmacyOrders>;
 
 describe('PharmacyOrders Component', () => {
   const mockPatient: fhir.Patient = {
@@ -103,7 +104,7 @@ describe('PharmacyOrders Component', () => {
   const mockSetCurrPageSize = jest.fn() as unknown as React.Dispatch<React.SetStateAction<number>>;
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
   });
 
   describe('Loading State', () => {

package/src/components/procedures/index.ts

@@ -1,21 +1,22 @@
-import { getSyncLifecycle } from '@openmrs/esm-framework';
+import { getAsyncLifecycle } from '@openmrs/esm-framework';
 
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import { moduleName } from '../../constants';
-import ProceduresTabs from './procedures-tabs.component';
 
 const options = {
   featureName: 'express-workflow',
   moduleName,
 };
 
-export const proceduresDashboard = getSyncLifecycle(ProceduresTabs, options);
+export const proceduresDashboard = getAsyncLifecycle(() => import('./procedures-tabs.component'), options);
 // t('procedures', 'Procedures')
-export const proceduresLeftPanelLink = getSyncLifecycle(
-  createDashboardLink({
-    path: 'procedures',
-    title: 'procedures',
-    icon: 'omrs-icon-movement',
-  }),
+export const proceduresLeftPanelLink = getAsyncLifecycle(
+  () =>
+    import('@openmrs/esm-patient-common-lib').then((m) => ({
+      default: m.createDashboardLink({
+        path: 'procedures',
+        title: 'procedures',
+        icon: 'omrs-icon-movement',
+      }),
+    })),
   options,
 );

package/src/components/procedures/procedures-table.component.tsx

@@ -1,6 +1,12 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useConfig } from '@openmrs/esm-framework';
-import { EmptyState, useLaunchWorkspaceRequiringVisit } from '@openmrs/esm-patient-common-lib';
+import {
+  EmptyState,
+  invalidateVisitAndEncounterData,
+  invalidateVisitByUuid,
+  useLaunchWorkspaceRequiringVisit,
+  usePatientChartStore,
+} from '@openmrs/esm-patient-common-lib';
 import { Layer } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 
@@ -9,15 +15,32 @@ import OrderTable from '../../shared/orders/OrderTable';
 import { type Order } from '../../types/order/order';
 import { type ExpressWorkflowConfig } from '../../config-schema';
 import styles from './procedures.scss';
+import { useSWRConfig } from 'swr';
 
 type ProceduresTableProps = {
   orders: Order[];
+  patientUuid: string;
+  patient: fhir.Patient;
 };
-const ProceduresTable: React.FC<ProceduresTableProps> = ({ orders }) => {
+const ProceduresTable: React.FC<ProceduresTableProps> = ({ orders, patientUuid, patient }) => {
   const { t } = useTranslation();
   const { imagingOrderTypeUuid, imagingOrderableConceptSets } = useConfig<ExpressWorkflowConfig>();
-
-  const launchAddLabOrder = useLaunchWorkspaceRequiringVisit('add-procedures-order');
+  const { visitContext } = usePatientChartStore(patientUuid);
+  const { mutate: globalMutate } = useSWRConfig();
+  const windowProps = useMemo(() => ({ encounterUuid: orders[0]?.encounter?.uuid }), [orders[0]?.encounter?.uuid]);
+  const groupProps = useMemo(
+    () => ({
+      patient,
+      patientUuid: patient?.id,
+      visitContext: visitContext,
+      mutateVisitContext: () => {
+        invalidateVisitByUuid(globalMutate, visitContext.uuid);
+        invalidateVisitAndEncounterData(globalMutate, patient.id);
+      },
+    }),
+    [globalMutate, visitContext, patient.id],
+  );
+  const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patientUuid ?? '', 'order-basket');
 
   if (orders?.length === 0) {
     return (
@@ -26,10 +49,14 @@ const ProceduresTable: React.FC<ProceduresTableProps> = ({ orders }) => {
           displayText={t('orders', 'Orders')}
           headerTitle={t('proceduresOrders', 'Procedures Orders')}
           launchForm={() =>
-            launchAddLabOrder({
-              orderTypeUuid: imagingOrderTypeUuid,
-              orderableConceptSets: imagingOrderableConceptSets,
-            })
+            launchOrderBasket(
+              {
+                orderTypeUuid: imagingOrderTypeUuid,
+                orderableConceptSets: imagingOrderableConceptSets,
+              },
+              windowProps,
+              groupProps,
+            )
           }
         />
       </Layer>
@@ -41,10 +68,14 @@ const ProceduresTable: React.FC<ProceduresTableProps> = ({ orders }) => {
       title={t('proceduresOrders', 'Procedures Orders')}
       orders={orders}
       onAdd={() =>
-        launchAddLabOrder({
-          orderTypeUuid: imagingOrderTypeUuid,
-          orderableConceptSets: imagingOrderableConceptSets,
-        })
+        launchOrderBasket(
+          {
+            orderTypeUuid: imagingOrderTypeUuid,
+            orderableConceptSets: imagingOrderableConceptSets,
+          },
+          windowProps,
+          groupProps,
+        )
       }
       containerClassName={styles.labTableContainer}
       tableCellClassName={styles.tableCell}

package/src/components/procedures/procedures-tabs.component.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useConfig } from '@openmrs/esm-framework';
 
 import OrdersTabs from '../../shared/orders/OrdersTabs';
-import LabTable from './procedures-table.component';
+import ProceduresTable from './procedures-table.component';
 import { ExpressWorkflowConfig } from '../../config-schema';
 
 type ProceduresTabsProps = {
@@ -20,7 +20,7 @@ const ProceduresTabs: React.FC<ProceduresTabsProps> = ({ patientUuid, patient })
       resultsSlotName="ewf-procedures-results-slot"
       orderTypeUuid={imagingOrderTypeUuid}
       filter={(order) => order.concept?.conceptClass?.uuid === proceduresConceptClassUuid}
-      Table={({ orders }) => <LabTable orders={orders} />}
+      Table={({ orders }) => <ProceduresTable orders={orders} patientUuid={patientUuid} patient={patient} />}
     />
   );
 };

package/src/components/radiology-and-imaging/index.ts

@@ -1,21 +1,25 @@
-import { getSyncLifecycle } from '@openmrs/esm-framework';
+import { getAsyncLifecycle } from '@openmrs/esm-framework';
 
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib/src';
 import { moduleName } from '../../constants';
-import RadiologyAndImagingTabs from './radiology-and-imaging.component';
 
 const options = {
   featureName: 'express-workflow',
   moduleName,
 };
 
-export const radiologyAndImagingDashboard = getSyncLifecycle(RadiologyAndImagingTabs, options);
+export const radiologyAndImagingDashboard = getAsyncLifecycle(
+  () => import('./radiology-and-imaging.component'),
+  options,
+);
 // t('radiologyAndImaging', 'Radiology and Imaging')
-export const radiologyAndImagingLeftPanelLink = getSyncLifecycle(
-  createDashboardLink({
-    path: 'radiology-and-imaging',
-    title: 'radiologyAndImaging',
-    icon: 'omrs-icon-user-xray',
-  }),
+export const radiologyAndImagingLeftPanelLink = getAsyncLifecycle(
+  () =>
+    import('@openmrs/esm-patient-common-lib').then((m) => ({
+      default: m.createDashboardLink({
+        path: 'radiology-and-imaging',
+        title: 'radiologyAndImaging',
+        icon: 'omrs-icon-user-xray',
+      }),
+    })),
   options,
 );

package/src/components/radiology-and-imaging/radiology-and-imaging-table.component.tsx

@@ -1,7 +1,6 @@
-import React from 'react';
-import { parseDate, formatDatetime, useConfig } from '@openmrs/esm-framework';
-import { CardHeader, EmptyState, useLaunchWorkspaceRequiringVisit } from '@openmrs/esm-patient-common-lib';
-import { Add } from '@carbon/react/icons';
+import React, { useMemo } from 'react';
+import { useConfig } from '@openmrs/esm-framework';
+import { EmptyState, useLaunchWorkspaceRequiringVisit, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import { Layer } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import OrderTable from '../../shared/orders/OrderTable';
@@ -11,13 +10,26 @@ import { type ExpressWorkflowConfig } from '../../config-schema';
 import styles from './radiology-and-imaging.scss';
 
 type RadiologyAndImagingTableProps = {
-  orders: Order[];
+  orders: Array<Order>;
+  patientUuid: string;
+  patient: fhir.Patient;
 };
-const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ orders }) => {
+const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ orders, patientUuid, patient }) => {
   const { t } = useTranslation();
   const { imagingOrderTypeUuid, imagingOrderableConceptSets } = useConfig<ExpressWorkflowConfig>();
+  const { mutateVisitContext, visitContext } = usePatientChartStore(patientUuid);
 
-  const launchAddLabOrder = useLaunchWorkspaceRequiringVisit('add-imaging-order');
+  const windowProps = useMemo(() => ({ encounterUuid: orders[0]?.encounter?.uuid }), [orders[0]?.encounter?.uuid]);
+  const groupProps = useMemo(
+    () => ({
+      patient,
+      patientUuid: patient?.id,
+      visitContext: visitContext,
+      mutateVisitContext: mutateVisitContext,
+    }),
+    [patient, visitContext, mutateVisitContext],
+  );
+  const launchAddLabOrder = useLaunchWorkspaceRequiringVisit(patientUuid, 'order-basket');
 
   if (orders?.length === 0) {
     return (
@@ -26,10 +38,14 @@ const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ ord
           displayText={t('orders', 'Orders')}
           headerTitle={t('radiologyAndImagingOrders', 'Radiology and Imaging Orders')}
           launchForm={() =>
-            launchAddLabOrder({
-              orderTypeUuid: imagingOrderTypeUuid,
-              orderableConceptSets: imagingOrderableConceptSets,
-            })
+            launchAddLabOrder(
+              {
+                orderTypeUuid: imagingOrderTypeUuid,
+                orderableConceptSets: imagingOrderableConceptSets,
+              },
+              windowProps,
+              groupProps,
+            )
           }
         />
       </Layer>
@@ -41,10 +57,14 @@ const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ ord
       title={t('radiologyAndImagingOrders', 'Radiology & Imaging Orders')}
       orders={orders}
       onAdd={() =>
-        launchAddLabOrder({
-          orderTypeUuid: imagingOrderTypeUuid,
-          orderableConceptSets: imagingOrderableConceptSets,
-        })
+        launchAddLabOrder(
+          {
+            orderTypeUuid: imagingOrderTypeUuid,
+            orderableConceptSets: imagingOrderableConceptSets,
+          },
+          windowProps,
+          groupProps,
+        )
       }
       containerClassName={styles.labTableContainer}
       tableCellClassName={styles.tableCell}

package/src/components/radiology-and-imaging/radiology-and-imaging.component.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useConfig } from '@openmrs/esm-framework';
 import OrdersTabs from '../../shared/orders/OrdersTabs';
-import LabTable from './radiology-and-imaging-table.component';
+import RadiologyAndImagingTable from './radiology-and-imaging-table.component';
 import { ExpressWorkflowConfig } from '../../config-schema';
 
 type RadiologyAndImagingTabsProps = {
@@ -20,7 +20,7 @@ const RadiologyAndImagingTabs: React.FC<RadiologyAndImagingTabsProps> = ({ patie
       resultsSlotName="ewf-radiology-and-imaging-results-slot"
       orderTypeUuid={imagingOrderTypeUuid}
       filter={(order) => order.concept?.conceptClass?.uuid === imagingRadiologyConceptClassUuid}
-      Table={({ orders }) => <LabTable orders={orders} />}
+      Table={({ orders }) => <RadiologyAndImagingTable orders={orders} patientUuid={patientUuid} patient={patient} />}
     />
   );
 };