@kenyaemr/esm-ward-app 8.1.1-pre.121 → 8.1.1-pre.124

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

@@ -1,12 +1,4 @@
-import {
-  Button,
-  ButtonSet,
-  Form,
-  InlineNotification,
-  RadioButton,
-  RadioButtonGroup,
-  RadioButtonSkeleton,
-} from '@carbon/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';
@@ -16,8 +8,9 @@ import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { BedLayout, WardViewContext, WardPatientWorkspaceProps } from '../../types';
-import { assignPatientToBed, createEncounter } from '../../ward.resource';
+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({
@@ -32,10 +25,8 @@ export default function PatientBedSwapForm({
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
-  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
-  const { isLoading, mutate: mutateAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
-  const { mutate: mutateInpatientRequest } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
-  const { mutate: mutateInpatientAdmission } = wardPatientGroupDetails?.inpatientAdmissionResponse ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { isLoading } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
 
   const zodSchema = useMemo(
     () =>
@@ -71,14 +62,6 @@ export default function PatientBedSwapForm({
   );
 
   const beds = wardPatientGroupDetails?.bedLayouts ?? [];
-  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 onSubmit = useCallback(
     (values: FormValues) => {
@@ -98,47 +81,58 @@ 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,
-              }),
-            });
+            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,
           });
         })
         .finally(() => {
           setIsSubmitting(false);
-          mutateAdmissionLocation();
-          mutateInpatientRequest();
-          mutateInpatientAdmission();
+          wardPatientGroupDetails.mutate();
           closeWorkspaceWithSavedChanges();
         });
     },
-    [
-      setShowErrorNotifications,
-      patient,
-      emrConfiguration,
-      currentProvider,
-      location,
-      beds,
-      mutateAdmissionLocation,
-      mutateInpatientRequest,
-      mutateInpatientAdmission,
-    ],
+    [setShowErrorNotifications, patient, emrConfiguration, currentProvider, location, beds, wardPatientGroupDetails],
   );
 
   const onError = useCallback(() => {
@@ -166,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

@@ -9,7 +9,7 @@ import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
 import LocationSelector from '../../location-selector/location-selector.component';
-import type { ObsPayload, WardViewContext, WardPatientWorkspaceProps } from '../../types';
+import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { createEncounter } from '../../ward.resource';
 import styles from './patient-transfer-swap.scss';
 
@@ -30,9 +30,6 @@ export default function PatientTransferForm({
     [emrConfiguration],
   );
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
-  const { mutate: mutateAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
-  const { mutate: mutateInpatientAdmission } = wardPatientGroupDetails?.inpatientAdmissionResponse ?? {};
-  const { mutate: mutateInpatientRequest } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
 
   const zodSchema = useMemo(
     () =>
@@ -134,9 +131,7 @@ export default function PatientTransferForm({
         .finally(() => {
           setIsSubmitting(false);
           closeWorkspaceWithSavedChanges();
-          mutateAdmissionLocation();
-          mutateInpatientAdmission();
-          mutateInpatientRequest();
+          wardPatientGroupDetails.mutate();
         });
     },
     [
@@ -146,9 +141,7 @@ export default function PatientTransferForm({
       emrConfiguration,
       patient?.uuid,
       dispositionsWithTypeTransfer,
-      mutateAdmissionLocation,
-      mutateInpatientAdmission,
-      mutateInpatientRequest,
+      wardPatientGroupDetails,
     ],
   );
 

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',
@@ -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.resource.ts

@@ -1,5 +1,7 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import type { Encounter, EncounterPayload } from './types';
+import { openmrsFetch, type Patient, restBaseUrl, useSession } from '@openmrs/esm-framework';
+import type { DispositionType, Encounter, EncounterPayload } from './types';
+import useEmrConfiguration from './hooks/useEmrConfiguration';
+import useWardLocation from './hooks/useWardLocation';
 
 export function createEncounter(encounterPayload: EncounterPayload) {
   return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
@@ -11,6 +13,34 @@ export function createEncounter(encounterPayload: EncounterPayload) {
   });
 }
 
+export function useAdmitPatient() {
+  const { location } = useWardLocation();
+  const { currentProvider } = useSession();
+  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
+
+  const admitPatient = (patient: Patient, dispositionType: DispositionType) => {
+    return createEncounter({
+      patient: patient.uuid,
+      encounterType:
+        dispositionType === 'ADMIT'
+          ? emrConfiguration.admissionEncounterType.uuid
+          : dispositionType === 'TRANSFER'
+            ? emrConfiguration.transferWithinHospitalEncounterType.uuid
+            : null,
+      location: location?.uuid,
+      encounterProviders: [
+        {
+          provider: currentProvider?.uuid,
+          encounterRole: emrConfiguration.clinicianEncounterRole.uuid,
+        },
+      ],
+      obs: [],
+    });
+  };
+
+  return { admitPatient, isLoadingEmrConfiguration, errorFetchingEmrConfiguration };
+}
+
 export function assignPatientToBed(bedUuid: number, patientUuid: string, encounterUuid: string) {
   return openmrsFetch(`${restBaseUrl}/beds/${bedUuid}`, {
     method: 'POST',

package/translations/en.json

@@ -5,7 +5,6 @@
   "admit": "Admit",
   "admitPatient": "Admit patient",
   "admitting": "Admitting...",
-  "bedManagementModuleNotInstalled": "Bed management module is not present to allow bed selection",
   "bedShare": "Bed share",
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
@@ -21,7 +20,7 @@
   "emptyBed": "Empty bed",
   "emptyText": "Empty",
   "encounterDisplay": "{{encounterType}} {{encounterDate}}",
-  "errorAssigningBedToPatient": "Error assigning bed to patient",
+  "errorChangingPatientBedAssignment": "Error changing patient bed assignment",
   "errorConfiguringPatientCard": "Error configuring patient card",
   "errorConfiguringPatientCardMessage": "Unable to find configuration for {{elementType}}, id: {{id}}",
   "errorCreatingEncounter": "Failed to admit patient",
@@ -45,6 +44,7 @@
   "manage": "Manage",
   "motherChildBedShare": "Mother / Child",
   "nextPage": "Next page",
+  "noBed": "No bed",
   "noBedsConfigured": "No beds configured for this location",
   "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
   "noLocationsFound": "No locations found",
@@ -56,14 +56,16 @@
   "patientAdmittedSuccessfully": "Patient admitted successfully",
   "patientAdmittedSuccessfullySubtitle": "{{patientName}} has been successfully admitted and assigned to bed {{bedNumber}}",
   "patientAdmittedWoBed": "Patient admitted successfully to {{location}}",
-  "patientAssignedNewbed": "Patient assigned to new bed",
-  "patientAssignedToBed": "{{patientName}} assigned to bed {{bedNumber}}",
+  "patientAssignedNewBed": "Patient assigned to new bed",
+  "patientAssignedNewBedDetail": "{{patientName}} assigned to bed {{bedNumber}}",
   "patientNoteNowVisible": "It should be now visible in the notes history",
   "patientNoteSaveError": "Error saving patient note",
   "patientNotesDidntLoad": "Patient notes didn't load",
   "patients": "Patients",
   "patientsMetricValue": "{{ metricValue }}",
   "patientTransferRequestCreated": "Patient transfer request created",
+  "patientUnassignedFromBed": "Patient unassigned from bed",
+  "patientUnassignedFromBedDetail": "{{patientName}} is now unassigned from bed",
   "patientWasDischarged": "Patient was discharged",
   "pendingOut": "Pending out",
   "pendingOutMetricValue": "{{ metricValue }}",
@@ -87,7 +89,6 @@
   "transfers": "Transfers",
   "transferType": "Transfer type",
   "typeOfTransfer": "Type of transfer",
-  "unableToSelectBeds": "Unable to select beds",
   "unknown": "Unknown",
   "visitNoteSaved": "Patient note saved",
   "wardClinicalNotePlaceholder": "Write any notes here",