@kenyaemr/esm-morgue-app 5.4.2-pre.2297 → 5.4.2-pre.2305

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"action-buttons","component":"actionBarButtons","slot":"mortuary-action-buttons-slot","meta":{"fullWidth":false,"privileges":["o3 : View Mortuary Dashboard","o3 : Admit Body to Mortuary","o3 : Edit Mortuary Records","o3 : Discharge Body from Mortuary","o3 : View Mortuary Compartments","o3 : Swap Mortuary Compartments","o3 : View Mortuary Billing","o3 : Process Mortuary Payments","o3 : View Mortuary Reports","o3 : Generate Mortuary Reports"]}},{"name":"deceased-banner-info","component":"bannerInfo","slot":"deceased-banner-info-slot","meta":{"fullWidth":false}},{"component":"root","name":"morgue-dashboard-root","slot":"morgue-dashboard-slot","meta":{"privileges":["o3 : View Mortuary Dashboard"]}}],"workspaces":[{"name":"patient-additional-info-form","component":"patientAdditionalInfoForm","title":"add more details","type":"other-form"},{"name":"discharge-body-form","component":"dischargeBodyForm","title":"discharge body form","type":"other-form"},{"name":"admit-body-form","component":"admitBodyForm","title":"Admission form","type":"other-form"},{"name":"swap-unit-form","component":"swapForm","title":"Swap form","type":"other-form"},{"name":"admit-deceased-person-form","component":"admitDeceasedPersonForm","title":"Admit Deceased Person","type":"other-form"},{"name":"mortuary-form-entry","component":"mortuaryFormEntry","title":"Mortuary Form Entry","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"dispose-deceased-person-form","component":"disposeDeceasedPersonForm","title":"Dispose Deceased Person","type":"other-form"}],"pages":[{"component":"root","route":"morgue"}],"version":"5.4.2-pre.2297"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"action-buttons","component":"actionBarButtons","slot":"mortuary-action-buttons-slot","meta":{"fullWidth":false,"privileges":["o3 : View Mortuary Dashboard","o3 : Admit Body to Mortuary","o3 : Edit Mortuary Records","o3 : Discharge Body from Mortuary","o3 : View Mortuary Compartments","o3 : Swap Mortuary Compartments","o3 : View Mortuary Billing","o3 : Process Mortuary Payments","o3 : View Mortuary Reports","o3 : Generate Mortuary Reports"]}},{"name":"deceased-banner-info","component":"bannerInfo","slot":"deceased-banner-info-slot","meta":{"fullWidth":false}},{"component":"root","name":"morgue-dashboard-root","slot":"morgue-dashboard-slot","meta":{"privileges":["o3 : View Mortuary Dashboard"]}}],"workspaces":[{"name":"patient-additional-info-form","component":"patientAdditionalInfoForm","title":"add more details","type":"other-form"},{"name":"discharge-body-form","component":"dischargeBodyForm","title":"discharge body form","type":"other-form"},{"name":"admit-body-form","component":"admitBodyForm","title":"Admission form","type":"other-form"},{"name":"swap-unit-form","component":"swapForm","title":"Swap form","type":"other-form"},{"name":"admit-deceased-person-form","component":"admitDeceasedPersonForm","title":"Admit Deceased Person","type":"other-form"},{"name":"mortuary-form-entry","component":"mortuaryFormEntry","title":"Mortuary Form Entry","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"dispose-deceased-person-form","component":"disposeDeceasedPersonForm","title":"Dispose Deceased Person","type":"other-form"}],"pages":[{"component":"root","route":"morgue"}],"version":"5.4.2-pre.2305"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-morgue-app",
-  "version": "5.4.2-pre.2297",
+  "version": "5.4.2-pre.2305",
   "description": "morgue app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-morgue-app.js",
   "main": "src/index.ts",

package/src/bed-layout/discharged/discharged-bed-layout.component.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { InlineLoading } from '@carbon/react';
+import { DataTableSkeleton, InlineLoading, Pagination } from '@carbon/react';
 import { launchWorkspace, useConfig } from '@openmrs/esm-framework';
 import styles from '../bed-layout.scss';
 import { type MortuaryLocationResponse } from '../../types';
@@ -31,6 +31,11 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
     dischargedPatientUuids,
     isLoading: encountersLoading,
     error: encountersError,
+    currentPage,
+    totalCount,
+    currPageSize,
+    setCurrPageSize,
+    goTo,
   } = useMortuaryDischargeEncounter(morgueDischargeEncounterTypeUuid, AdmittedDeceasedPatient);
 
   const {
@@ -51,6 +56,13 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
     }
   };
 
+  const handlePageSizeChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    const newPageSize = parseInt(event.target.value, 10);
+    setCurrPageSize(newPageSize);
+    // Reset to first page when changing page size
+    goTo(1);
+  };
+
   if (isLoading || encountersLoading || patientsLoading) {
     return (
       <div className={styles.loadingContainer}>
@@ -69,8 +81,8 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
 
   if (!dischargedPatients || dischargedPatients.length === 0) {
     return (
-      <div className={styles.emptyState}>
-        <p>{t('noDischargedPatients', 'No discharged patients found')}</p>
+      <div className={styles.loadingContainer}>
+        <DataTableSkeleton columnCount={5} rowCount={5} zebra />
       </div>
     );
   }
@@ -102,6 +114,23 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
           );
         })}
       </div>
+
+      <div className={styles.paginationFooter}>
+        <Pagination
+          page={currentPage || 1}
+          totalItems={totalCount || 0}
+          pageSize={currPageSize}
+          pageSizes={[10, 20, 50, 100]}
+          onChange={({ page, pageSize }: { page: number; pageSize: number }) => {
+            if (pageSize !== currPageSize) {
+              setCurrPageSize(pageSize);
+              goTo(1);
+            } else {
+              goTo(page);
+            }
+          }}
+        />
+      </div>
     </div>
   );
 };

package/src/bed-layout/discharged/discharged-bed-layout.resource.ts

@@ -1,29 +1,38 @@
-import {
-  FetchResponse,
-  fhirBaseUrl,
-  openmrsFetch,
-  restBaseUrl,
-  useFhirFetchAll,
-  useFhirPagination,
-} from '@openmrs/esm-framework';
+import { FetchResponse, fhirBaseUrl, openmrsFetch, restBaseUrl, useFhirPagination } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { type Patient, type FHIREncounter, MortuaryLocationResponse, Entry } from '../../types';
+import { type Patient, MortuaryLocationResponse, Entry } from '../../types';
 import { useMemo, useState } from 'react';
 import { parseDisplayText } from '../../utils/utils';
+import { usePaginationInfo } from '@openmrs/esm-patient-common-lib';
 
 export const useMortuaryDischargeEncounter = (
   dischargeEncounterTypeUuid: string,
   admissionLocation: MortuaryLocationResponse,
 ) => {
-  const pageSizes = [10, 20, 50, 100];
+  const [currPageSize, setCurrPageSize] = useState(100);
   const locationUuid = admissionLocation?.ward?.uuid;
-  const [currPageSize, setCurrPageSize] = useState(10);
+
   const urls = !admissionLocation
     ? null
     : `${fhirBaseUrl}/Encounter?_summary=data&type=${dischargeEncounterTypeUuid}&location=${locationUuid}`;
+
   const { data, isLoading, error, paginated, currentPage, goTo, totalCount, currentPageSize, mutate } =
     useFhirPagination<Entry>(urls, currPageSize);
 
+  const currentItems = useMemo(() => {
+    if (!data) {
+      return 0;
+    }
+    return data.length;
+  }, [data]);
+
+  const { pageSizes: calculatedPageSizes, itemsDisplayed } = usePaginationInfo(
+    currPageSize,
+    totalCount || 0,
+    currentPage || 1,
+    currentItems,
+  );
+
   const dischargedPatientUuids = useMemo(() => {
     if (!data) {
       return [];
@@ -67,7 +76,8 @@ export const useMortuaryDischargeEncounter = (
     error: error,
     paginated,
     currentPage,
-    pageSizes,
+    pageSizes: calculatedPageSizes,
+    itemsDisplayed,
     goTo,
     currPageSize,
     setCurrPageSize,

package/src/bed-linelist-view/admitted/admitted-bed-linelist-view.component.tsx

@@ -254,6 +254,7 @@ const AdmittedBedLineListView: React.FC<AdmittedBedLineListViewProps> = ({
             patientUuid,
             bedUuid,
             bedId,
+            personUuid: patient.person?.uuid || '',
           });
         }
       }

package/src/bed-linelist-view/discharged/discharged-bed-line-view.component.tsx

@@ -1,4 +1,3 @@
-// DischargedBedLineListView.tsx
 import React, { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {

package/src/config-schema.ts

@@ -108,11 +108,6 @@ export const configSchema = {
     _description: 'Encounter UUID for autopsy',
     _default: '32b61a73-4971-4fc0-b20b-9a30176317e2',
   },
-  nextOfKinNamesUuid: {
-    _type: Type.String,
-    _description: 'UUID for next of kin names concept',
-    _default: '830bef6d-b01f-449d-9f8d-ac0fede8dbd3',
-  },
   courtOrderCaseNumberUuid: {
     _type: Type.String,
     _description: 'UUID for court order case number concept',
@@ -170,7 +165,6 @@ export type ConfigObject = {
   adminUuid: string;
   autopsyFormUuid: string;
   autopsyEncounterFormUuid: string;
-  nextOfKinNamesUuid: string;
   courtOrderCaseNumberUuid: string;
   serialNumberUuid: string;
 };

package/src/forms/admit-deceased-person-workspace/admit-deceased-person.resource.ts

@@ -26,6 +26,7 @@ import { z } from 'zod';
 import dayjs from 'dayjs';
 import { customRepProps } from '../../constants';
 import { BillingConfig, ConfigObject } from '../../config-schema';
+import { parseDischargeDateTime } from '../../utils/utils';
 
 export const useVisitType = () => {
   const customRepresentation = 'custom:(uuid,display,name)';
@@ -132,6 +133,56 @@ export const useMortuaryOperation = (location?: string) => {
     morgueAdmissionEncounterTypeUuid,
   } = useConfig<ConfigObject>();
 
+  const createDisposalMortuaryEncounter = useCallback(
+    async (visit: Visit, data: z.infer<typeof disposeSchema>, encounterDateTime: Date) => {
+      const obs = [];
+
+      if (data.courtOrderCaseNumber && data.courtOrderCaseNumber.trim() !== '' && courtOrderCaseNumberUuid) {
+        obs.push({
+          concept: courtOrderCaseNumberUuid,
+          value: data.courtOrderCaseNumber.trim(),
+        });
+      }
+
+      if (data.serialNumber && data.serialNumber.trim() !== '' && serialNumberUuid) {
+        obs.push({
+          concept: serialNumberUuid,
+          value: data.serialNumber.trim(),
+        });
+      }
+
+      const encounterPayload = {
+        encounterDatetime: encounterDateTime.toISOString(),
+        patient: visit?.patient?.uuid,
+        encounterType: morgueDischargeEncounterTypeUuid,
+        location: visit?.location?.uuid,
+        encounterProviders: [
+          {
+            provider: currentProvider?.uuid,
+            encounterRole: emrConfiguration?.clinicianEncounterRole?.uuid,
+          },
+        ],
+        visit: visit?.uuid,
+        ...(obs.length > 0 && { obs }),
+      };
+
+      return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
+        method: 'POST',
+        headers: {
+          'content-type': 'application/json',
+        },
+        body: encounterPayload,
+      });
+    },
+    [
+      currentProvider?.uuid,
+      emrConfiguration?.clinicianEncounterRole?.uuid,
+      courtOrderCaseNumberUuid,
+      serialNumberUuid,
+      morgueDischargeEncounterTypeUuid,
+    ],
+  );
+
   const createMortuaryAdmissionEncounter = useCallback(
     async (
       patientUuid: string,
@@ -150,20 +201,21 @@ export const useMortuaryOperation = (location?: string) => {
       }: z.infer<typeof deceasedPatientAdmitSchema>,
     ) => {
       const obs = [];
-      if (tagNumber) {
-        obs.push({ concept: tagNumberUuid, value: tagNumber });
+
+      if (tagNumber && tagNumber.trim() !== '' && tagNumberUuid) {
+        obs.push({ concept: tagNumberUuid, value: tagNumber.trim() });
       }
-      if (obNumber) {
-        obs.push({ concept: obNumberUuid, value: obNumber });
+      if (obNumber && obNumber.trim() !== '' && obNumberUuid) {
+        obs.push({ concept: obNumberUuid, value: obNumber.trim() });
       }
-      if (policeName) {
-        obs.push({ concept: policeNameUuid, value: policeName });
+      if (policeName && policeName.trim() !== '' && policeNameUuid) {
+        obs.push({ concept: policeNameUuid, value: policeName.trim() });
       }
-      if (policeIDNo) {
-        obs.push({ concept: policeIDNumber, value: policeIDNo });
+      if (policeIDNo && policeIDNo.trim() !== '' && policeIDNumber) {
+        obs.push({ concept: policeIDNumber, value: policeIDNo.trim() });
       }
-      if (dischargeArea) {
-        obs.push({ concept: dischargeAreaUuid, value: dischargeArea });
+      if (dischargeArea && dischargeArea.trim() !== '' && dischargeAreaUuid) {
+        obs.push({ concept: dischargeAreaUuid, value: dischargeArea.trim() });
       }
 
       const visitAttributes = [];
@@ -206,30 +258,19 @@ export const useMortuaryOperation = (location?: string) => {
       policeNameUuid,
       tagNumberUuid,
       morgueAdmissionEncounterTypeUuid,
-      nextOfKinNameUuid,
-      courtOrderCaseNumberUuid,
-      serialNumberUuid,
-      morgueDischargeEncounterTypeUuid,
-      visitPaymentMethodAttributeUuid,
-      burialPermitNumberUuid,
     ],
   );
 
-  const createDisposalMortuaryEncounter = useCallback(
-    async (visit: Visit, data: z.infer<typeof disposeSchema>) => {
+  const createDischargeMortuaryEncounter = useCallback(
+    async (visit: Visit, data: z.infer<typeof dischargeSchema>, encounterDateTime: Date) => {
       const obs = [];
-      if (data.nextOfKinNames) {
-        obs.push({ concept: nextOfKinNameUuid, value: data.nextOfKinNames });
-      }
-      if (data.courtOrderCaseNumber) {
-        obs.push({ concept: courtOrderCaseNumberUuid, value: data.courtOrderCaseNumber });
-      }
-      if (data.serialNumber) {
-        obs.push({ concept: serialNumberUuid, value: data.serialNumber });
+
+      if (data.burialPermitNumber && data.burialPermitNumber.trim() !== '' && burialPermitNumberUuid) {
+        obs.push({ concept: burialPermitNumberUuid, value: data.burialPermitNumber.trim() });
       }
 
       const encounterPayload = {
-        encounterDatetime: data?.dateOfDischarge,
+        encounterDatetime: encounterDateTime.toISOString(),
         patient: visit?.patient?.uuid,
         encounterType: morgueDischargeEncounterTypeUuid,
         location: visit?.location?.uuid,
@@ -240,8 +281,9 @@ export const useMortuaryOperation = (location?: string) => {
           },
         ],
         visit: visit?.uuid,
-        obs: obs.length > 0 ? obs : undefined,
+        ...(obs.length > 0 && { obs }),
       };
+
       return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
         method: 'POST',
         headers: {
@@ -250,9 +292,13 @@ export const useMortuaryOperation = (location?: string) => {
         body: encounterPayload,
       });
     },
-    [burialPermitNumberUuid, currentProvider?.uuid, emrConfiguration?.clinicianEncounterRole?.uuid],
+    [
+      burialPermitNumberUuid,
+      currentProvider?.uuid,
+      emrConfiguration?.clinicianEncounterRole?.uuid,
+      morgueDischargeEncounterTypeUuid,
+    ],
   );
-
   const assignDeceasedToCompartment = useCallback(
     async (patientUuid: string, bedId: number, encounterUuid: string) =>
       openmrsFetch(`${restBaseUrl}/beds/${bedId}`, {
@@ -284,38 +330,6 @@ export const useMortuaryOperation = (location?: string) => {
     [assignDeceasedToCompartment, createMortuaryAdmissionEncounter],
   );
 
-  const createDischargeMortuaryEncounter = useCallback(
-    async (visit: Visit, data: z.infer<typeof dischargeSchema>) => {
-      const obs = [];
-      if (data.burialPermitNumber) {
-        obs.push({ concept: burialPermitNumberUuid, value: data.burialPermitNumber });
-      }
-
-      const encounterPayload = {
-        encounterDatetime: data?.dateOfDischarge,
-        patient: visit?.patient?.uuid,
-        encounterType: morgueDischargeEncounterTypeUuid,
-        location: visit?.location,
-        encounterProviders: [
-          {
-            provider: currentProvider?.uuid,
-            encounterRole: emrConfiguration?.clinicianEncounterRole?.uuid,
-          },
-        ],
-        visit: visit?.uuid,
-        obs: obs.length > 0 ? obs : undefined,
-      };
-      return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
-        method: 'POST',
-        headers: {
-          'content-type': 'application/json',
-        },
-        body: encounterPayload,
-      });
-    },
-    [burialPermitNumberUuid, currentProvider?.uuid, emrConfiguration?.clinicianEncounterRole?.uuid],
-  );
-
   const removeDeceasedFromCompartment = useCallback(
     async (patientUuid: string, bedId: number) =>
       openmrsFetch(`${restBaseUrl}/beds/${bedId}?patientUuid=${patientUuid}`, {
@@ -325,12 +339,13 @@ export const useMortuaryOperation = (location?: string) => {
   );
 
   const endCurrentVisit = useCallback(
-    async (currentVisit: Visit, queueEntry: MappedVisitQueueEntry, data: z.infer<typeof dischargeSchema>) => {
+    async (currentVisit: Visit, queueEntry: MappedVisitQueueEntry, stopDateTime: Date) => {
       const abortController = new AbortController();
+
       const response = await updateVisit(
         currentVisit.uuid,
         {
-          stopDatetime: new Date(),
+          stopDatetime: stopDateTime,
         },
         abortController,
       );
@@ -349,22 +364,49 @@ export const useMortuaryOperation = (location?: string) => {
 
   const dischargeBody = useCallback(
     async (visit: Visit, queueEntry: MappedVisitQueueEntry, bedId: number, data: z.infer<typeof dischargeSchema>) => {
-      const dischargeEncounter = await createDischargeMortuaryEncounter(visit, data);
-      const compartment = await removeDeceasedFromCompartment(visit?.patient?.uuid, bedId);
-      await endCurrentVisit(visit, queueEntry, data);
-      return { dischargeEncounter, compartment };
+      try {
+        const dischargeDateTime = parseDischargeDateTime({
+          ...data,
+          dateOfDischarge: data.dateOfDischarge ?? new Date(),
+        });
+
+        const dischargeEncounter = await createDischargeMortuaryEncounter(visit, data, dischargeDateTime);
+
+        const compartment = await removeDeceasedFromCompartment(visit?.patient?.uuid, bedId);
+
+        const visitStopTime = new Date(dischargeDateTime.getTime() + 60000); // 1 minute after discharge
+
+        await endCurrentVisit(visit, queueEntry, visitStopTime);
+
+        return { dischargeEncounter, compartment };
+      } catch (error) {
+        throw error;
+      }
     },
-    [createDischargeMortuaryEncounter, endCurrentVisit, removeDeceasedFromCompartment],
+    [createDischargeMortuaryEncounter, endCurrentVisit, removeDeceasedFromCompartment, parseDischargeDateTime],
   );
-
   const disposeBody = useCallback(
     async (visit: Visit, queueEntry: MappedVisitQueueEntry, bedId: number, data: z.infer<typeof disposeSchema>) => {
-      const disposeEncounter = await createDischargeMortuaryEncounter(visit, data);
-      const compartment = await removeDeceasedFromCompartment(visit?.patient?.uuid, bedId);
-      await endCurrentVisit(visit, queueEntry, data);
-      return { disposeEncounter, compartment };
+      try {
+        const disposalDateTime = parseDischargeDateTime({
+          ...data,
+          dateOfDischarge: data.dateOfDischarge ?? new Date(),
+        });
+
+        const disposeEncounter = await createDisposalMortuaryEncounter(visit, data, disposalDateTime);
+
+        const compartment = await removeDeceasedFromCompartment(visit?.patient?.uuid, bedId);
+
+        const visitStopTime = new Date(disposalDateTime.getTime() + 60000);
+
+        await endCurrentVisit(visit, queueEntry, visitStopTime);
+
+        return { disposeEncounter, compartment };
+      } catch (error) {
+        throw error;
+      }
     },
-    [createDisposalMortuaryEncounter, endCurrentVisit, removeDeceasedFromCompartment],
+    [createDisposalMortuaryEncounter, endCurrentVisit, removeDeceasedFromCompartment, parseDischargeDateTime],
   );
 
   const createEncounterForCompartmentSwap = useCallback(

package/src/forms/admit-deceased-person-workspace/admit-deceased-person.scss

@@ -96,7 +96,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  width: 140%;
+  width: 100%;
   padding: layout.$spacing-03 0;
   border-bottom: 1px solid colors.$gray-20;
 

package/src/forms/admit-deceased-person-workspace/admit-deceased-person.workspace.tsx

@@ -229,7 +229,6 @@ const AdmitDeceasedPerson: React.FC<AdmitDeceasedPersonProps> = ({
           <DeceasedPatientHeader patientData={patientData} />
           <ResponsiveWrapper>
             <FormGroup legendText="">
-              <Column></Column>
               <Column>
                 <Controller
                   name="dateOfAdmission"
@@ -335,33 +334,35 @@ const AdmitDeceasedPerson: React.FC<AdmitDeceasedPersonProps> = ({
                           control={control}
                           name="availableCompartment"
                           render={({ field }) => (
-                            <RadioButtonGroup
-                              className={styles.radioButtonGroup}
-                              orientation="vertical"
-                              name="availableCompartment"
-                              valueSelected={field.value}
-                              onChange={field.onChange}>
-                              {filteredBeds.map((bed, index) => (
-                                <div key={index} className={styles.compartmentOption}>
+                            <div className={styles.radioButtonGroup}>
+                              {filteredBeds.map((bed) => (
+                                <div key={bed.bedId} className={styles.compartmentOption}>
                                   <div className={styles.radioButtonWrapper}>
                                     <RadioButton
                                       className={styles.radioButton}
-                                      id={`compartment-${index}`}
+                                      id={`compartment-${bed.bedId}`}
                                       labelText={bed.bedNumber}
                                       value={bed.bedId}
+                                      name="availableCompartment"
+                                      checked={field.value === bed.bedId}
+                                      onChange={(value, name, event) => {
+                                        field.onChange(bed.bedId);
+                                      }}
                                     />
                                   </div>
                                   <div className={styles.compartmentTags}>
-                                    <Tag type={bed.bedType?.display === 'VIP' ? 'green' : 'blue'} size="sm">
-                                      {bed.bedType?.displayName || ''}
-                                    </Tag>
+                                    {bed.bedType && (
+                                      <Tag type={bed.bedType?.display === 'VIP' ? 'green' : 'blue'} size="sm">
+                                        {bed.bedType?.displayName || ''}
+                                      </Tag>
+                                    )}
                                     <Tag type={bed.status === 'AVAILABLE' ? 'green' : 'red'} size="sm">
                                       {bed?.status || ''}
                                     </Tag>
                                   </div>
                                 </div>
                               ))}
-                            </RadioButtonGroup>
+                            </div>
                           )}
                         />
                       </>