@kenyaemr/esm-ward-app 8.1.1-pre.129 → 8.1.2-pre.152

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

@@ -1,60 +1,31 @@
-import { age, attach, ExtensionSlot, type Patient } from '@openmrs/esm-framework';
-import React, { useEffect } from 'react';
-import styles from './ward-patient.style.scss';
-import { useTranslation } from 'react-i18next';
+import { attach, ExtensionSlot, useConfig } from '@openmrs/esm-framework';
+import React from 'react';
 import { type WardPatientWorkspaceProps } from '../../types';
-import { getGender } from '../../ward-patient-card/row-elements/ward-patient-gender.component';
+import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
+import styles from './ward-patient.style.scss';
+import { type WardConfigObject } from '../../config-schema';
+import classNames from 'classnames';
 
 attach('ward-patient-workspace-header-slot', 'patient-vitals-info');
 
-export default function WardPatientWorkspace({ setTitle, wardPatient }: WardPatientWorkspaceProps) {
-  useEffect(() => {
-    if (wardPatient) {
-      const { patient } = wardPatient;
-      setTitle(patient.person.display, <PatientWorkspaceTitle key={patient.uuid} patient={patient} />);
-    }
-  }, [wardPatient]);
+export default function WardPatientWorkspace({ wardPatient }: WardPatientWorkspaceProps) {
+  const { patient } = wardPatient ?? {};
+  const { hideWorkspaceVitalsLinks } = useConfig<WardConfigObject>();
+  const extensionSlotState = { patient, patientUuid: patient?.uuid, hideLinks: hideWorkspaceVitalsLinks };
 
   return (
     <>
       {wardPatient && (
-        <div className={styles.workspaceContainer}>
-          <WardPatientWorkspaceView patient={wardPatient.patient} />
+        <div className={classNames(styles.workspaceContainer, styles.patientWorkspace)}>
+          <WardPatientWorkspaceBanner {...{ wardPatient }} />
+          <ExtensionSlot name="ward-patient-workspace-header-slot" state={extensionSlotState} />
+          <ExtensionSlot
+            name="ward-patient-workspace-content-slot"
+            state={extensionSlotState}
+            className={styles.patientWorkspaceContentSlot}
+          />
         </div>
       )}
     </>
   );
 }
-
-interface WardPatientWorkspaceViewProps {
-  patient: Patient;
-}
-
-const WardPatientWorkspaceView: React.FC<WardPatientWorkspaceViewProps> = ({ patient }) => {
-  const extensionSlotState = { patient, patientUuid: patient.uuid };
-
-  return (
-    <>
-      <div>
-        <ExtensionSlot name="ward-patient-workspace-header-slot" state={extensionSlotState} />
-      </div>
-      <div>
-        <ExtensionSlot name="ward-patient-workspace-content-slot" state={extensionSlotState} />
-      </div>
-    </>
-  );
-};
-
-const PatientWorkspaceTitle: React.FC<WardPatientWorkspaceViewProps> = ({ patient }) => {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <div>{patient.person.display} &nbsp;</div>
-      <div className={styles.headerPatientDetail}>&middot; &nbsp; {getGender(t, patient.person?.gender)}</div>
-      {patient.person?.birthdate && (
-        <div className={styles.headerPatientDetail}>&middot; &nbsp; {age(patient.person?.birthdate)}</div>
-      )}
-    </>
-  );
-};

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

@@ -1,39 +1,28 @@
+import React, { useCallback, useState } from 'react';
 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 { ExtensionSlot, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import { type WardPatientWorkspaceProps, type WardViewContext } from '../../types';
-import { createEncounter, removePatientFromBed } from '../../ward.resource';
+import { removePatientFromBed, useCreateEncounter } from '../../ward.resource';
+import useWardLocation from '../../hooks/useWardLocation';
 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 [isSubmitting, setIsSubmitting] = useState(false);
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
-  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
+  const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
+    useCreateEncounter();
   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: [],
-    })
+    createEncounter(wardPatient?.patient, emrConfiguration.exitFromInpatientEncounterType)
       .then((response) => {
         if (response?.ok) {
           if (wardPatient?.bed?.id) {
@@ -63,11 +52,12 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
         wardPatientGroupDetails.mutate();
       });
   }, [
-    currentProvider,
-    location,
+    createEncounter,
+    wardPatient?.patient,
+    wardPatient.bed.id,
     emrConfiguration,
-    wardPatient?.patient?.uuid,
-    wardPatient?.bed?.uuid,
+    t,
+    closeWorkspaceWithSavedChanges,
     wardPatientGroupDetails,
   ]);
 
@@ -75,7 +65,7 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
   return (
     <div className={styles.workspaceContent}>
       <div className={styles.patientWorkspaceBanner}>
-        <WardPatientWorkspaceBanner {...props?.wardPatient} />
+        <WardPatientWorkspaceBanner wardPatient={props?.wardPatient} />
       </div>
       <div className={styles.workspaceForm}>
         <div>

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

@@ -1,15 +1,13 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 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 { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import useEmrConfiguration from '../../hooks/useEmrConfiguration';
-import useWardLocation from '../../hooks/useWardLocation';
-import type { BedLayout, WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { assignPatientToBed, createEncounter, removePatientFromBed } from '../../ward.resource';
+import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
+import type { WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { assignPatientToBed, useCreateEncounter, removePatientFromBed } from '../../ward.resource';
 import BedSelector from '../bed-selector.component';
 import styles from './patient-transfer-swap.scss';
 
@@ -21,10 +19,9 @@ export default function PatientBedSwapForm({
   const { patient } = wardPatient;
   const { t } = useTranslation();
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
-  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
+  const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
+    useCreateEncounter();
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const { currentProvider } = useSession();
-  const { location } = useWardLocation();
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { isLoading } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
 
@@ -50,35 +47,16 @@ export default function PatientBedSwapForm({
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
-
-  const getBedInformation = useCallback(
-    (bed: BedLayout) => {
-      const patients = bed.patients.map((bedPatient) => bedPatient?.person?.preferredName?.display);
-      const bedNumber = bed.bedNumber;
-      return [bedNumber, ...(patients.length ? patients : [t('empty', 'Empty')])].join(' · ');
-    },
-    [t],
-  );
+  }, [isDirty, promptBeforeClosing]);
 
-  const beds = wardPatientGroupDetails?.bedLayouts ?? [];
+  const beds = useMemo(() => wardPatientGroupDetails?.bedLayouts ?? [], [wardPatientGroupDetails]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
       const bedSelected = beds.find((bed) => bed.bedId === values.bedId);
+      setIsSubmitting(true);
       setShowErrorNotifications(false);
-      createEncounter({
-        patient: patient.uuid,
-        encounterType: emrConfiguration.transferWithinHospitalEncounterType.uuid,
-        location: location?.uuid,
-        encounterProviders: [
-          {
-            provider: currentProvider?.uuid,
-            encounterRole: emrConfiguration.clinicianEncounterRole.uuid,
-          },
-        ],
-        obs: [],
-      })
+      createEncounter(patient, emrConfiguration.bedAssignmentEncounterType)
         .then(async (response) => {
           if (response.ok) {
             if (bedSelected) {
@@ -132,7 +110,7 @@ export default function PatientBedSwapForm({
           closeWorkspaceWithSavedChanges();
         });
     },
-    [setShowErrorNotifications, patient, emrConfiguration, currentProvider, location, beds, wardPatientGroupDetails],
+    [beds, createEncounter, patient, emrConfiguration, t, wardPatientGroupDetails, closeWorkspaceWithSavedChanges],
   );
 
   const onError = useCallback(() => {

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

@@ -1,16 +1,16 @@
-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 classNames from 'classnames';
+import { z } from 'zod';
+import { Button, ButtonSet, Form, InlineNotification, RadioButton, RadioButtonGroup, TextArea } from '@carbon/react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { z } from 'zod';
-import useEmrConfiguration from '../../hooks/useEmrConfiguration';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { ResponsiveWrapper, showSnackbar, useAppContext, useLayoutType, useSession } from '@openmrs/esm-framework';
+import { useCreateEncounter } from '../../ward.resource';
+import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import useWardLocation from '../../hooks/useWardLocation';
+import AdmissionPatientButton from '../admit-patient-button.component';
 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({
@@ -18,11 +18,12 @@ export default function PatientTransferForm({
   wardPatient,
   promptBeforeClosing,
 }: WardPatientWorkspaceProps) {
-  const { patient } = wardPatient ?? {};
   const { t } = useTranslation();
+  const { patient, inpatientAdmission } = wardPatient ?? {};
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
+  const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
+    useCreateEncounter();
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
   const dispositionsWithTypeTransfer = useMemo(
@@ -30,6 +31,8 @@ export default function PatientTransferForm({
     [emrConfiguration],
   );
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
+  const isAdmitted = inpatientAdmission != null;
 
   const zodSchema = useMemo(
     () =>
@@ -69,12 +72,12 @@ export default function PatientTransferForm({
     if (dispositionsWithTypeTransfer?.length === 1) {
       setValue('transferType', dispositionsWithTypeTransfer[0].uuid);
     }
-  }, [dispositionsWithTypeTransfer]);
+  }, [dispositionsWithTypeTransfer, setValue]);
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -98,23 +101,12 @@ export default function PatientTransferForm({
         });
       }
 
-      createEncounter({
-        patient: patient?.uuid,
-        encounterType: emrConfiguration.transferRequestEncounterType.uuid,
-        location: location.uuid,
-        encounterProviders: [
-          {
-            encounterRole: emrConfiguration.clinicianEncounterRole.uuid,
-            provider: currentProvider?.uuid,
-          },
-        ],
-        obs: [
-          {
-            concept: emrConfiguration.dispositionDescriptor.dispositionSetConcept.uuid,
-            groupMembers: obs,
-          },
-        ],
-      })
+      createEncounter(patient, emrConfiguration.transferRequestEncounterType, [
+        {
+          concept: emrConfiguration.dispositionDescriptor.dispositionSetConcept.uuid,
+          groupMembers: obs,
+        },
+      ])
         .then(() => {
           showSnackbar({
             title: t('patientTransferRequestCreated', 'Patient transfer request created'),
@@ -135,12 +127,12 @@ export default function PatientTransferForm({
         });
     },
     [
-      setShowErrorNotifications,
-      currentProvider,
-      location,
-      emrConfiguration,
-      patient?.uuid,
+      closeWorkspaceWithSavedChanges,
+      createEncounter,
       dispositionsWithTypeTransfer,
+      emrConfiguration,
+      patient,
+      t,
       wardPatientGroupDetails,
     ],
   );
@@ -150,7 +142,28 @@ export default function PatientTransferForm({
     setShowErrorNotifications(true);
   }, []);
 
-  if (!wardPatientGroupDetails) return <></>;
+  if (!wardPatientGroupDetails) {
+    return <></>;
+  }
+  if (!isAdmitted) {
+    return (
+      <div className={styles.workspaceContent}>
+        <div className={styles.formError}>
+          <InlineNotification
+            kind="info"
+            title={t('unableToTransferPatient', 'Unable to transfer patient')}
+            subtitle={t(
+              'unableToTransferPatientNotYetAdmitted',
+              'This patient is not admitted to this ward. Admit this patient before transferring them to a different location.',
+            )}
+            lowContrast
+            hideCloseButton
+          />
+        </div>
+        <AdmissionPatientButton wardPatient={wardPatient} onAdmitPatientSuccess={closeWorkspaceWithSavedChanges} />
+      </div>
+    );
+  }
   return (
     <Form
       onSubmit={handleSubmit(onSubmit, onError)}

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

@@ -9,6 +9,10 @@
   color: #393939;
 }
 
+.formError {
+  margin-bottom: layout.$spacing-05;
+}
+
 .workspaceContent {
   padding: layout.$spacing-05;
   height: 100%;

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

@@ -23,7 +23,7 @@ export default function PatientTransferAndSwapWorkspace(props: WardPatientWorksp
   return (
     <div className={styles.flexWrapper}>
       <div className={styles.patientWorkspaceBanner}>
-        <WardPatientWorkspaceBanner {...props?.wardPatient} />
+        <WardPatientWorkspaceBanner wardPatient={props?.wardPatient} />
       </div>
       {isBedManagementModuleInstalled && (
         <div className={styles.contentSwitcherWrapper}>

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

@@ -5,7 +5,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { Button, Column, Form, InlineLoading, InlineNotification, Row, Stack, TextArea } from '@carbon/react';
 import {
-  createErrorHandler,
   type DefaultWorkspaceProps,
   type PatientUuid,
   ResponsiveWrapper,
@@ -13,13 +12,17 @@ import {
   translateFrom,
   useSession,
 } from '@openmrs/esm-framework';
-import { savePatientNote } from '../notes.resource';
-import styles from './notes-form.scss';
 import { moduleName } from '../../../constant';
+import { savePatientNote } from '../notes.resource';
 import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
+import styles from './notes-form.scss';
 
 type NotesFormData = z.infer<typeof noteFormSchema>;
 
+interface PatientNotesFormProps extends DefaultWorkspaceProps {
+  patientUuid: PatientUuid;
+}
+
 const noteFormSchema = z.object({
   wardClinicalNote: z.string().refine((val) => val.trim().length > 0, {
     //t('clinicalNoteErrorMessage','Clinical note is required')
@@ -27,10 +30,6 @@ const noteFormSchema = z.object({
   }),
 });
 
-interface PatientNotesFormProps extends DefaultWorkspaceProps {
-  patientUuid: PatientUuid;
-}
-
 const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
   closeWorkspaceWithSavedChanges,
   patientUuid,
@@ -39,8 +38,9 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
   const { t } = useTranslation();
   const session = useSession();
+
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [rows, setRows] = useState<number>();
+  const [rows, setRows] = useState(0);
 
   const {
     control,
@@ -93,26 +93,31 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
           closeWorkspaceWithSavedChanges();
           showSnackbar({
             isLowContrast: true,
-            subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
             kind: 'success',
+            subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
             title: t('visitNoteSaved', 'Patient note saved'),
           });
         })
         .catch((err) => {
-          createErrorHandler();
-
           showSnackbar({
-            title: t('patientNoteSaveError', 'Error saving patient note'),
-            kind: 'error',
             isLowContrast: false,
+            kind: 'error',
             subtitle: err?.message,
+            title: t('patientNoteSaveError', 'Error saving patient note'),
           });
         })
-        .finally(() => {
-          setIsSubmitting(false);
-        });
+        .finally(() => setIsSubmitting(false));
     },
-    [emrConfiguration, patientUuid, locationUuid, providerUuid],
+    [
+      closeWorkspaceWithSavedChanges,
+      emrConfiguration?.clinicianEncounterRole.uuid,
+      emrConfiguration?.consultFreeTextCommentsConcept.uuid,
+      emrConfiguration?.inpatientNoteEncounterType.uuid,
+      locationUuid,
+      patientUuid,
+      providerUuid,
+      t,
+    ],
   );
 
   const onError = (errors) => console.error(errors);
@@ -146,19 +151,19 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
                 <ResponsiveWrapper>
                   <TextArea
                     id="additionalNote"
-                    rows={rows}
-                    labelText={t('clinicalNoteLabel', 'Write your notes')}
-                    placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
-                    value={value}
-                    onBlur={onBlur}
                     invalid={!!errors.wardClinicalNote}
                     invalidText={errors.wardClinicalNote?.message}
+                    labelText={t('clinicalNoteLabel', 'Write your notes')}
+                    onBlur={onBlur}
                     onChange={(event) => {
                       onChange(event);
-                      const textareaLineHeight = 24; // This is the default line height for Carbon's TextArea component
-                      const newRows = Math.ceil(event.target.scrollHeight / textareaLineHeight);
+                      const textAreaLineHeight = 24; // This is the default line height for Carbon's TextArea component
+                      const newRows = Math.ceil(event.target.scrollHeight / textAreaLineHeight);
                       setRows(newRows);
                     }}
+                    placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
+                    rows={rows}
+                    value={value}
                   />
                 </ResponsiveWrapper>
               )}
@@ -167,9 +172,9 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
         </Row>
       </Stack>
       <Button
-        kind="primary"
         className={styles.saveButton}
         disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
+        kind="primary"
         type="submit">
         {isSubmitting ? <InlineLoading description={t('saving', 'Saving...')} /> : <span>{t('save', 'Save')}</span>}
       </Button>

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

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

package/src/ward.resource.ts

@@ -1,32 +1,17 @@
-import { openmrsFetch, type Patient, restBaseUrl, useSession } from '@openmrs/esm-framework';
-import type { DispositionType, Encounter, EncounterPayload } from './types';
+import { openmrsFetch, type OpenmrsResource, type Patient, restBaseUrl, useSession } from '@openmrs/esm-framework';
+import type { DispositionType, Encounter, EncounterPayload, ObsPayload } from './types';
 import useEmrConfiguration from './hooks/useEmrConfiguration';
 import useWardLocation from './hooks/useWardLocation';
 
-export function createEncounter(encounterPayload: EncounterPayload) {
-  return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json',
-    },
-    body: encounterPayload,
-  });
-}
-
-export function useAdmitPatient() {
+export function useCreateEncounter() {
   const { location } = useWardLocation();
   const { currentProvider } = useSession();
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
 
-  const admitPatient = (patient: Patient, dispositionType: DispositionType) => {
-    return createEncounter({
+  const createEncounter = (patient: Patient, encounterType: OpenmrsResource, obs: ObsPayload[] = []) => {
+    const encounterPayload = {
       patient: patient.uuid,
-      encounterType:
-        dispositionType === 'ADMIT'
-          ? emrConfiguration.admissionEncounterType.uuid
-          : dispositionType === 'TRANSFER'
-            ? emrConfiguration.transferWithinHospitalEncounterType.uuid
-            : null,
+      encounterType,
       location: location?.uuid,
       encounterProviders: [
         {
@@ -34,10 +19,35 @@ export function useAdmitPatient() {
           encounterRole: emrConfiguration.clinicianEncounterRole.uuid,
         },
       ],
-      obs: [],
+      obs,
+    };
+
+    return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+      },
+      body: encounterPayload,
     });
   };
 
+  return { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration };
+}
+
+export function useAdmitPatient() {
+  const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
+    useCreateEncounter();
+
+  const admitPatient = (patient: Patient, dispositionType: DispositionType) => {
+    const encounterType =
+      dispositionType === 'ADMIT'
+        ? emrConfiguration.admissionEncounterType
+        : dispositionType === 'TRANSFER'
+          ? emrConfiguration.transferWithinHospitalEncounterType
+          : null;
+    return createEncounter(patient, encounterType);
+  };
+
   return { admitPatient, isLoadingEmrConfiguration, errorFetchingEmrConfiguration };
 }
 

package/translations/en.json

@@ -1,4 +1,5 @@
 {
+  "admissionRequestCancelled": "Admission request cancelled.",
   "admissionRequests": "Admission requests",
   "admissionRequestsCount_one": "{{count}} admission request",
   "admissionRequestsCount_other": "{{count}} admission requests",
@@ -8,18 +9,20 @@
   "bedShare": "Bed share",
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
+  "cancelAdmissionRequest": "Cancel admission request",
   "capacity": "Capacity",
   "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
+  "clinicalNotes": "Clinical notes",
   "countItems_one": "{{count}} {{item}}",
   "countItems_other": "{{count}} {{item}}",
   "discharge": "Discharge",
-  "empty": "Empty",
   "emptyBed": "Empty bed",
   "emptyText": "Empty",
   "encounterDisplay": "{{encounterType}} {{encounterDate}}",
+  "Error cancelling admission request": "Error cancelling admission request",
   "errorChangingPatientBedAssignment": "Error changing patient bed assignment",
   "errorConfiguringPatientCard": "Error configuring patient card",
   "errorConfiguringPatientCardMessage": "Unable to find configuration for {{elementType}}, id: {{id}}",
@@ -50,6 +53,7 @@
   "noLocationsFound": "No locations found",
   "note": "Note",
   "notes": "Notes",
+  "notesRequiredForCancellingRequest": "Notes required for cancelling admission or transfer request",
   "Orders": "Orders",
   "other": "Other",
   "patientAdmittedButBedNotAssigned": "Patient admitted successfully but fail to assign bed to patient",
@@ -89,6 +93,8 @@
   "transfers": "Transfers",
   "transferType": "Transfer type",
   "typeOfTransfer": "Type of transfer",
+  "unableToTransferPatient": "Unable to transfer patient",
+  "unableToTransferPatientNotYetAdmitted": "This patient is not admitted to this ward. Admit this patient before transferring them to a different location.",
   "unknown": "Unknown",
   "visitNoteSaved": "Patient note saved",
   "wardClinicalNotePlaceholder": "Write any notes here",