(fix) O3-4270: Group obs by encounter instead of datetime

packages/esm-generic-patient-widgets-app/src/obs-table/obs-table.component.tsx

@@ -22,9 +22,11 @@ interface ObsTableProps {
 const ObsTable: React.FC<ObsTableProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const config = useConfig();
-  const { data: obss, error, isLoading, isValidating } = useObs(patientUuid, config.showEncounterType);
-  const uniqueDates = [...new Set(obss.map((o) => o.issued))].sort();
-  const obssByDate = uniqueDates.map((date) => obss.filter((o) => o.issued === date));
+  const { data: obss } = useObs(patientUuid, config.showEncounterType);
+  const uniqueEncounterReferences = [...new Set(obss.map((o) => o.encounter.reference))].sort();
+  const obssGroupedByEncounters = uniqueEncounterReferences.map((date) =>
+    obss.filter((o) => o.encounter.reference === date),
+  );
 
   const tableHeaders = [
     { key: 'date', header: t('dateAndTime', 'Date and time'), isSortable: true },
@@ -40,7 +42,7 @@ const ObsTable: React.FC<ObsTableProps> = ({ patientUuid }) => {
 
   const tableRows = React.useMemo(
     () =>
-      obssByDate?.map((obss, index) => {
+      obssGroupedByEncounters?.map((obss, index) => {
         const rowData = {
           id: `${index}`,
           date: formatDatetime(new Date(obss[0].effectiveDateTime), { mode: 'wide' }),
@@ -91,7 +93,7 @@ const ObsTable: React.FC<ObsTableProps> = ({ patientUuid }) => {
 
         return rowData;
       }),
-    [config, obssByDate],
+    [config.data, config?.dateFormat, obssGroupedByEncounters],
   );
 
   const { results, goTo, currentPage } = usePagination(tableRows, config.table.pageSize);

packages/esm-generic-patient-widgets-app/src/resources/useObs.ts

@@ -15,6 +15,10 @@ type ObsResult = fhir.Observation & {
   valueDateTime?: string;
   encounter?: {
     name?: string;
+    /**
+     * Reference to the encounter resource, in the format `Encounter/{uuid}`
+     */
+    reference: string;
   };
 };
 

packages/esm-patient-orders-app/src/lab-results/lab-result.component.tsx

@@ -1,4 +1,4 @@
-import { Tile, InlineLoading , InlineNotification } from '@carbon/react';
+import { Tile, InlineLoading, InlineNotification } from '@carbon/react';
 import { type Order } from '@openmrs/esm-patient-common-lib';
 import React from 'react';
 import { useTranslation } from 'react-i18next';

packages/esm-patient-orders-app/translations/en.json

@@ -30,9 +30,9 @@
   "errorSavingLabResults": "Error saving lab results",
   "goToDrugOrderForm": "Order form",
   "indication": "Indication",
-  "labResultError": "Error loading lab results",
   "inStock": "In stock",
   "instructions": "Instructions",
+  "labResultError": "Error loading lab results",
   "launchOrderBasket": "Launch order basket",
   "loading": "Loading",
   "loadingInitialValues": "Loading initial values",