@kenyaemr/esm-ward-app 8.0.1-pre.99 → 8.0.2

package/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx

@@ -0,0 +1,113 @@
+import { Button, ButtonSet, InlineNotification } from '@carbon/react';
+import { Exit } from '@carbon/react/icons';
+import { ExtensionSlot, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
+import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import useEmrConfiguration from '../../hooks/useEmrConfiguration';
+import useWardLocation from '../../hooks/useWardLocation';
+import { type WardPatientWorkspaceProps, type WardViewContext } from '../../types';
+import { createEncounter, removePatientFromBed } from '../../ward.resource';
+import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
+import styles from './patient-discharge.scss';
+
+export default function PatientDischargeWorkspace(props: WardPatientWorkspaceProps) {
+  const { wardPatient, closeWorkspaceWithSavedChanges } = props;
+  const { t } = useTranslation();
+  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+  const { currentProvider } = useSession();
+  const { location } = useWardLocation();
+  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+
+  const submitDischarge = useCallback(() => {
+    setIsSubmitting(true);
+
+    createEncounter({
+      patient: wardPatient?.patient?.uuid,
+      encounterType: emrConfiguration.exitFromInpatientEncounterType.uuid,
+      location: location.uuid,
+      encounterProviders: [
+        {
+          encounterRole: emrConfiguration.clinicianEncounterRole.uuid,
+          provider: currentProvider?.uuid,
+        },
+      ],
+      obs: [],
+    })
+      .then((response) => {
+        if (response?.ok) {
+          if (wardPatient?.bed?.id) {
+            return removePatientFromBed(wardPatient.bed.id, wardPatient?.patient?.uuid);
+          }
+          return response;
+        }
+      })
+      .then((response) => {
+        if (response?.ok) {
+          showSnackbar({
+            title: t('patientWasDischarged', 'Patient was discharged'),
+            kind: 'success',
+          });
+        }
+      })
+      .catch((err: Error) => {
+        showSnackbar({
+          title: t('errorDischargingPatient', 'Error discharging patient'),
+          subtitle: err.message,
+          kind: 'error',
+        });
+      })
+      .finally(() => {
+        setIsSubmitting(false);
+        closeWorkspaceWithSavedChanges();
+        wardPatientGroupDetails.mutate();
+      });
+  }, [
+    currentProvider,
+    location,
+    emrConfiguration,
+    wardPatient?.patient?.uuid,
+    wardPatient?.bed?.uuid,
+    wardPatientGroupDetails,
+  ]);
+
+  if (!wardPatientGroupDetails) return <></>;
+  return (
+    <div className={styles.workspaceContent}>
+      <div className={styles.patientWorkspaceBanner}>
+        <WardPatientWorkspaceBanner {...props?.wardPatient} />
+      </div>
+      <div className={styles.workspaceForm}>
+        <div>
+          {errorFetchingEmrConfiguration && (
+            <div className={styles.formError}>
+              <InlineNotification
+                kind="error"
+                title={t('somePartsOfTheFormDidntLoad', "Some parts of the form didn't load")}
+                subtitle={t(
+                  'fetchingEmrConfigurationFailed',
+                  'Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.',
+                )}
+                lowContrast
+                hideCloseButton
+              />
+            </div>
+          )}
+        </div>
+        <ExtensionSlot name="ward-patient-discharge-slot" />
+        <ButtonSet className={styles.buttonSet}>
+          <Button
+            size="sm"
+            kind="ghost"
+            renderIcon={(props) => <Exit size={16} {...props} />}
+            disabled={
+              isLoadingEmrConfiguration || isSubmitting || errorFetchingEmrConfiguration || !wardPatient?.patient
+            }
+            onClick={submitDischarge}>
+            {t('proceedWithPatientDischarge', 'Proceed with patient discharge')}
+          </Button>
+        </ButtonSet>
+      </div>
+    </div>
+  );
+}

package/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx

@@ -1,26 +1,17 @@
+import { Button, ButtonSet, Form, InlineNotification } from '@carbon/react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
+import classNames from 'classnames';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import styles from './patient-transfer-swap.scss';
-import { useAdmissionLocation } from '../../hooks/useAdmissionLocation';
-import { z } from 'zod';
-import { useTranslation } from 'react-i18next';
 import { Controller, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { filterBeds } from '../../ward-view/ward-view.resource';
-import type { BedLayout, WardPatientWorkspaceProps } from '../../types';
-import { assignPatientToBed, createEncounter } from '../../ward.resource';
+import { useTranslation } from 'react-i18next';
+import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
-import { showSnackbar, useSession } from '@openmrs/esm-framework';
 import useWardLocation from '../../hooks/useWardLocation';
-import { useInpatientRequest } from '../../hooks/useInpatientRequest';
-import {
-  Form,
-  ButtonSet,
-  Button,
-  RadioButtonGroup,
-  RadioButton,
-  RadioButtonSkeleton,
-  InlineNotification,
-} from '@carbon/react';
+import type { BedLayout, WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { assignPatientToBed, createEncounter, removePatientFromBed } from '../../ward.resource';
+import BedSelector from '../bed-selector.component';
+import styles from './patient-transfer-swap.scss';
 
 export default function PatientBedSwapForm({
   promptBeforeClosing,
@@ -30,13 +21,12 @@ export default function PatientBedSwapForm({
   const { patient } = wardPatient;
   const { t } = useTranslation();
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
-  const { isLoading, admissionLocation } = useAdmissionLocation();
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
-  const { mutate: mutateAdmissionLocation } = useAdmissionLocation();
-  const { mutate: mutateInpatientRequest } = useInpatientRequest();
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { isLoading } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
 
   const zodSchema = useMemo(
     () =>
@@ -71,15 +61,7 @@ export default function PatientBedSwapForm({
     [t],
   );
 
-  const beds = useMemo(() => (admissionLocation ? filterBeds(admissionLocation) : []), [admissionLocation]);
-  const bedDetails = useMemo(
-    () =>
-      beds.map((bed) => {
-        const isPatientAssignedToBed = bed.patients.find((bedPatient) => bedPatient.uuid === patient.uuid);
-        return { id: bed.bedId, label: getBedInformation(bed), isPatientAssignedToBed };
-      }),
-    [beds, getBedInformation],
-  );
+  const beds = wardPatientGroupDetails?.bedLayouts ?? [];
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -99,47 +81,69 @@ export default function PatientBedSwapForm({
       })
         .then(async (response) => {
           if (response.ok) {
-            return assignPatientToBed(values.bedId, patient.uuid, response.data.uuid);
+            if (bedSelected) {
+              return assignPatientToBed(values.bedId, patient.uuid, response.data.uuid);
+            } else {
+              // get the bed that the patient is currently assigned to
+              const bedAssignedToPatient = beds.find((bed) =>
+                bed.patients.some((bedPatient) => bedPatient.uuid == patient.uuid),
+              );
+              if (bedAssignedToPatient) {
+                return removePatientFromBed(bedAssignedToPatient.bedId, patient.uuid);
+              } else {
+                // no-op
+                return Promise.resolve({ ok: true });
+              }
+            }
           }
         })
         .then((response) => {
           if (response && response?.ok) {
-            showSnackbar({
-              kind: 'success',
-              title: t('patientAssignedNewbed', 'Patient assigned to new bed'),
-              subtitle: t('patientAssignedToBed', '{{patientName}} assigned to bed {{bedNumber}}', {
-                patientName: patient.person.preferredName.display,
-                bedNumber: bedSelected.bedNumber,
-              }),
-            });
-            mutateAdmissionLocation();
-            mutateInpatientRequest();
-            closeWorkspaceWithSavedChanges();
+            if (bedSelected) {
+              showSnackbar({
+                kind: 'success',
+                title: t('patientAssignedNewBed', 'Patient assigned to new bed'),
+                subtitle: t('patientAssignedNewBedDetail', '{{patientName}} assigned to bed {{bedNumber}}', {
+                  patientName: patient.person.preferredName.display,
+                  bedNumber: bedSelected.bedNumber,
+                }),
+              });
+            } else {
+              showSnackbar({
+                kind: 'success',
+                title: t('patientUnassignedFromBed', 'Patient unassigned from bed'),
+                subtitle: t('patientUnassignedFromBedDetail', '{{patientName}} is now unassigned from bed', {
+                  patientName: patient.person.preferredName.display,
+                }),
+              });
+            }
           }
         })
         .catch((error: Error) => {
           showSnackbar({
             kind: 'error',
-            title: t('errorAssigningBedToPatient', 'Error assigning bed to patient'),
+            title: t('errorChangingPatientBedAssignment', 'Error changing patient bed assignment'),
             subtitle: error?.message,
           });
-          mutateAdmissionLocation();
-          mutateInpatientRequest();
-          closeWorkspaceWithSavedChanges();
         })
         .finally(() => {
           setIsSubmitting(false);
+          wardPatientGroupDetails.mutate();
+          closeWorkspaceWithSavedChanges();
         });
     },
-    [setShowErrorNotifications, patient, emrConfiguration, currentProvider, location, beds],
+    [setShowErrorNotifications, patient, emrConfiguration, currentProvider, location, beds, wardPatientGroupDetails],
   );
 
   const onError = useCallback(() => {
     setShowErrorNotifications(true);
   }, []);
 
+  if (!wardPatientGroupDetails) return <></>;
   return (
-    <Form onSubmit={handleSubmit(onSubmit, onError)} className={styles.formContainer}>
+    <Form
+      onSubmit={handleSubmit(onSubmit, onError)}
+      className={classNames(styles.formContainer, styles.workspaceContent)}>
       <div>
         {errorFetchingEmrConfiguration && (
           <div className={styles.formError}>
@@ -156,36 +160,21 @@ export default function PatientBedSwapForm({
           </div>
         )}
         <h2 className={styles.productiveHeading02}>{t('selectABed', 'Select a bed')}</h2>
-        {isLoading ? (
-          <RadioButtonGroup className={styles.radioButtonGroup} name="bedId">
-            <RadioButtonSkeleton />
-            <RadioButtonSkeleton />
-            <RadioButtonSkeleton />
-          </RadioButtonGroup>
-        ) : (
-          <Controller
-            name="bedId"
-            control={control}
-            render={({ field: { onChange, value } }) => (
-              <RadioButtonGroup
-                className={styles.radioButtonGroup}
-                onChange={onChange}
-                invalid={!!errors?.bedId?.message}
-                invalidText={errors?.bedId?.message}>
-                {bedDetails.map(({ id, label, isPatientAssignedToBed }) => (
-                  <RadioButton
-                    key={id}
-                    labelText={label}
-                    control={control}
-                    value={id}
-                    checked={id === value}
-                    disabled={isPatientAssignedToBed}
-                  />
-                ))}
-              </RadioButtonGroup>
-            )}
-          />
-        )}
+        <Controller
+          name="bedId"
+          control={control}
+          render={({ field: { onChange, value }, fieldState: { error } }) => (
+            <BedSelector
+              beds={beds}
+              isLoadingBeds={isLoading}
+              currentPatient={patient}
+              selectedBedId={value}
+              error={error}
+              control={control}
+              onChange={onChange}
+            />
+          )}
+        />
         {showErrorNotifications && (
           <div className={styles.notifications}>
             {Object.values(errors).map((error) => (

package/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx

@@ -1,18 +1,17 @@
+import { Button, ButtonSet, Form, InlineNotification, RadioButton, RadioButtonGroup, TextArea } from '@carbon/react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { ResponsiveWrapper, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
+import classNames from 'classnames';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { ResponsiveWrapper, showSnackbar, useSession } from '@openmrs/esm-framework';
-import styles from './patient-transfer-swap.scss';
+import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { useAdmissionLocation } from '../../hooks/useAdmissionLocation';
 import { z } from 'zod';
-import { Controller, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import LocationSelector from '../../location-selector/location-selector.component';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
-import { createEncounter } from '../../ward.resource';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { ObsPayload, WardPatientWorkspaceProps } from '../../types';
-import { useInpatientRequest } from '../../hooks/useInpatientRequest';
-import { Form, ButtonSet, Button, TextArea, InlineNotification, RadioButtonGroup, RadioButton } from '@carbon/react';
+import LocationSelector from '../../location-selector/location-selector.component';
+import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { createEncounter } from '../../ward.resource';
+import styles from './patient-transfer-swap.scss';
 
 export default function PatientTransferForm({
   closeWorkspaceWithSavedChanges,
@@ -30,8 +29,7 @@ export default function PatientTransferForm({
     () => emrConfiguration?.dispositions.filter(({ type }) => type === 'TRANSFER'),
     [emrConfiguration],
   );
-  const { mutate: mutateAdmissionLocation } = useAdmissionLocation();
-  const { mutate: mutateInpatientRequest } = useInpatientRequest();
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
 
   const zodSchema = useMemo(
     () =>
@@ -64,7 +62,6 @@ export default function PatientTransferForm({
     formState: { errors, isDirty },
     control,
     handleSubmit,
-    getValues,
     setValue,
   } = useForm<FormValues>({ resolver: zodResolver(zodSchema), defaultValues: formDefaultValues });
 
@@ -102,8 +99,8 @@ export default function PatientTransferForm({
       }
 
       createEncounter({
-        patient: patient.uuid,
-        encounterType: emrConfiguration.visitNoteEncounterType.uuid,
+        patient: patient?.uuid,
+        encounterType: emrConfiguration.transferRequestEncounterType.uuid,
         location: location.uuid,
         encounterProviders: [
           {
@@ -123,9 +120,6 @@ export default function PatientTransferForm({
             title: t('patientTransferRequestCreated', 'Patient transfer request created'),
             kind: 'success',
           });
-          closeWorkspaceWithSavedChanges();
-          mutateAdmissionLocation();
-          mutateInpatientRequest();
         })
         .catch((err: Error) => {
           showSnackbar({
@@ -134,17 +128,20 @@ export default function PatientTransferForm({
             kind: 'error',
           });
         })
-        .finally(() => setIsSubmitting(false));
+        .finally(() => {
+          setIsSubmitting(false);
+          closeWorkspaceWithSavedChanges();
+          wardPatientGroupDetails.mutate();
+        });
     },
     [
       setShowErrorNotifications,
       currentProvider,
       location,
       emrConfiguration,
-      patient.uuid,
+      patient?.uuid,
       dispositionsWithTypeTransfer,
-      mutateAdmissionLocation,
-      mutateInpatientRequest,
+      wardPatientGroupDetails,
     ],
   );
 
@@ -153,8 +150,11 @@ export default function PatientTransferForm({
     setShowErrorNotifications(true);
   }, []);
 
+  if (!wardPatientGroupDetails) return <></>;
   return (
-    <Form onSubmit={handleSubmit(onSubmit, onError)} className={styles.formContainer}>
+    <Form
+      onSubmit={handleSubmit(onSubmit, onError)}
+      className={classNames(styles.formContainer, styles.workspaceContent)}>
       <div>
         {errorFetchingEmrConfiguration && (
           <div className={styles.formError}>
@@ -229,7 +229,7 @@ export default function PatientTransferForm({
         <Button
           type="submit"
           size="xl"
-          disabled={isLoadingEmrConfiguration || isSubmitting || errorFetchingEmrConfiguration}>
+          disabled={isLoadingEmrConfiguration || isSubmitting || errorFetchingEmrConfiguration || !patient}>
           {t('save', 'Save')}
         </Button>
       </ButtonSet>

package/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-swap.scss

@@ -2,6 +2,13 @@
 @use '@carbon/layout';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
+.flexWrapper {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  color: #393939;
+}
+
 .workspaceContent {
   padding: layout.$spacing-05;
   height: 100%;
@@ -10,8 +17,12 @@
   color: #393939;
 }
 
+.contentSwitcherWrapper {
+  padding: 0 layout.$spacing-05;
+}
+
 .patientWorkspaceBanner {
-  margin: (-(layout.$spacing-05)) (-(layout.$spacing-05)) layout.$spacing-05 (-(layout.$spacing-05));
+  margin-bottom: layout.$spacing-05;
 }
 
 .field {
@@ -26,7 +37,6 @@
 }
 
 .workspaceForm {
-  margin-top: layout.$spacing-05;
   flex: 1;
 }
 

package/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-swap.workspace.tsx

@@ -1,12 +1,12 @@
-import React, { useState } from 'react';
-import { useFeatureFlag } from '@openmrs/esm-framework';
 import { ContentSwitcher, Switch } from '@carbon/react';
+import { useFeatureFlag } from '@openmrs/esm-framework';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import PatientTransferForm from './patient-transfer-request-form.component';
+import type { WardPatientWorkspaceProps } from '../../types';
+import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import PatientBedSwapForm from './patient-bed-swap-form.component';
+import PatientTransferForm from './patient-transfer-request-form.component';
 import styles from './patient-transfer-swap.scss';
-import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
-import type { WardPatientWorkspaceProps } from '../../types';
 
 const TransferSection = {
   TRANSFER: 'transfer',
@@ -21,12 +21,12 @@ export default function PatientTransferAndSwapWorkspace(props: WardPatientWorksp
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
 
   return (
-    <div className={styles.workspaceContent}>
+    <div className={styles.flexWrapper}>
       <div className={styles.patientWorkspaceBanner}>
         <WardPatientWorkspaceBanner {...props?.wardPatient} />
       </div>
       {isBedManagementModuleInstalled && (
-        <div>
+        <div className={styles.contentSwitcherWrapper}>
           <h2 className={styles.productiveHeading02}>{t('typeOfTransfer', 'Type of transfer')}</h2>
           <div className={styles.contentSwitcher}>
             <ContentSwitcher onChange={({ name }) => setSelectedSection(name)}>
@@ -37,7 +37,11 @@ export default function PatientTransferAndSwapWorkspace(props: WardPatientWorksp
         </div>
       )}
       <div className={styles.workspaceForm}>
-        {selectedSection === 'transfer' ? <PatientTransferForm {...props} /> : <PatientBedSwapForm {...props} />}
+        {selectedSection === TransferSection.TRANSFER ? (
+          <PatientTransferForm {...props} />
+        ) : (
+          <PatientBedSwapForm {...props} />
+        )}
       </div>
     </div>
   );

package/src/ward-workspace/patient-transfer-request-workspace/patient-transfer-request.workspace.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import PatientTransferForm from '../patient-transfer-bed-swap/patient-transfer-request-form.component';
+import { type WardPatientWorkspaceProps } from '../../types';
+
+interface PatientTransferRequestFormProps extends WardPatientWorkspaceProps {}
+
+const PatientTransferRequestForm: React.FC<PatientTransferRequestFormProps> = (props) => {
+  return <PatientTransferForm {...props} />;
+};
+
+export default PatientTransferRequestForm;

package/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx

@@ -69,7 +69,7 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
       const notePayload = {
         patient: patientUuid,
         location: locationUuid,
-        encounterType: emrConfiguration?.visitNoteEncounterType.uuid,
+        encounterType: emrConfiguration?.inpatientNoteEncounterType.uuid,
         encounterProviders: [
           {
             encounterRole: emrConfiguration?.clinicianEncounterRole.uuid,

package/src/ward-workspace/ward-patient-notes/form/notes-form.test.tsx

@@ -54,7 +54,7 @@ test('renders a success snackbar upon successfully recording a visit note', asyn
         provider: undefined,
       },
     ]),
-    encounterType: emrConfigurationMock.visitNoteEncounterType.uuid,
+    encounterType: emrConfigurationMock.inpatientNoteEncounterType.uuid,
     location: undefined,
     obs: expect.arrayContaining([
       {

package/src/ward-workspace/ward-patient-notes/history/notes-container.component.tsx

@@ -14,12 +14,12 @@ interface PatientNotesHistoryProps {
 
 const PatientNotesHistory: React.FC<PatientNotesHistoryProps> = ({ patientUuid, visitUuid }) => {
   const { t } = useTranslation();
-  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
+  const { emrConfiguration, isLoadingEmrConfiguration } = useEmrConfiguration();
 
   const { patientNotes, isLoadingPatientNotes, errorFetchingPatientNotes } = usePatientNotes(
     patientUuid,
     visitUuid,
-    emrConfiguration?.visitNoteEncounterType?.uuid,
+    emrConfiguration?.inpatientNoteEncounterType?.uuid,
     emrConfiguration?.consultFreeTextCommentsConcept.uuid,
   );
 

package/src/ward-workspace/ward-patient-notes/notes.resource.ts

@@ -1,8 +1,7 @@
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-import { type PatientNote, type UsePatientNotes, type VisitEncountersFetchResponse } from './types';
-import { type EncounterPayload } from '../../types';
+import { openmrsFetch, restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
 import { useMemo } from 'react';
+import { type EncounterPayload } from '../../types';
+import { type PatientNote, type RESTPatientNote, type UsePatientNotes } from './types';
 
 export function savePatientNote(payload: EncounterPayload, abortController: AbortController = new AbortController()) {
   return openmrsFetch(`${restBaseUrl}/encounter`, {
@@ -29,15 +28,14 @@ export function usePatientNotes(
     'diagnoses';
   const encountersApiUrl = `${restBaseUrl}/encounter?patient=${patientUuid}&encounterType=${encounterType}&visit=${visitUuid}&v=${customRepresentation}`;
 
-  const { data, error, isLoading, isValidating, mutate } = useSWR<FetchResponse<VisitEncountersFetchResponse>, Error>(
+  const { data, error, isLoading, isValidating, mutate } = useOpenmrsFetchAll<RESTPatientNote>(
     patientUuid && encounterType ? encountersApiUrl : null,
-    openmrsFetch,
   );
 
   const patientNotes: Array<PatientNote> | null = useMemo(
     () =>
       data
-        ? data.data.results
+        ? data
             .map((encounter) => {
               const noteObs = encounter.obs.find((obs) => obs.concept.uuid === conceptUuid);
 

package/src/ward-workspace/ward-patient-notes/notes.workspace.tsx

@@ -17,7 +17,7 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceProps> = (props) =
     <div>
       <WardPatientWorkspaceBanner {...wardPatient} />
       <PatientNotesForm {...notesFormState} />
-      <PatientNotesHistory patientUuid={patientUuid} visitUuid={wardPatient?.visit.uuid} />
+      <PatientNotesHistory patientUuid={patientUuid} visitUuid={wardPatient?.visit?.uuid} />
     </div>
   );
 };

package/src/ward-workspace/ward-patient-notes/types.ts

@@ -1,9 +1,5 @@
 import { type Concept, type OpenmrsResource } from '@openmrs/esm-framework';
 
-export interface VisitEncountersFetchResponse {
-  results: Array<RESTPatientNote>;
-}
-
 export interface RESTPatientNote extends OpenmrsResource {
   uuid: string;
   display: string;