@kenyaemr/esm-ward-app 8.1.2-pre.214 → 8.5.1-pre.13

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true,"groups":["ward-patient"]},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient","groups":["ward-patient"]},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient","groups":["ward-patient"]},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge","hasOwnSidebar":true,"sidebarFamily":"ward-patient","groups":["ward-patient"]},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","hasOwnSidebar":true,"sidebarFamily":"ward-patient","width":"wider","groups":["ward-patient"]},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","title":"cancelAdmissionRequest","type":"cancel-admission-request","sidebarFamily":"ward-patient"}],"version":"8.1.2-pre.214"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardView","name":"ward-view","slot":"ward-view-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"name":"admission-requests-workspace-siderail-button","component":"admissionRequestsWorkspaceSideRailIcon","slot":"action-menu-ward-patient-admission-requests-items-slot"},{"name":"create-admission-request-workspace-siderail-button","component":"createAdmissionEncounterWorkspaceSideRailIcon","slot":"action-menu-ward-patient-admission-requests-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"pending-admission-requests","width":"wider"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","title":"admitPatient","type":"patient-search-workspace","width":"wider"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward patient","width":"extra-wide"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","width":"extra-wide","canMaximize":true,"type":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","width":"wider"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","title":"cancelAdmissionRequest","type":"cancel-admission-request"}],"workspaceGroups":[{"name":"ward-patient","members":["ward-patient-workspace","ward-patient-notes-workspace","patient-transfer-swap-workspace","patient-discharge-workspace","ward-patient-clinical-forms-workspace","add-drug-order","order-basket","add-lab-order"]},{"name":"ward-patient-admission-requests","members":["admission-requests-workspace","create-admission-encounter-workspace"]}],"version":"8.5.1-pre.13"}

package/mock.tsx

@@ -1,4 +1,9 @@
-import { mockAdmissionLocation, mockInpatientAdmissions, mockInpatientRequests } from '__mocks__';
+import {
+  mockAdmissionLocation,
+  mockInpatientAdmissions,
+  mockInpatientRequests,
+  mockLocationInpatientWard,
+} from '__mocks__';
 import { useAdmissionLocation } from './src/hooks/useAdmissionLocation';
 import { useInpatientAdmission } from './src/hooks/useInpatientAdmission';
 import { createAndGetWardPatientGrouping } from './src/ward-view/ward-view.resource';
@@ -35,6 +40,7 @@ const mockInpatientAdmissionResponse = jest.mocked(useInpatientAdmission).mockRe
   error: undefined,
   mutate: jest.fn(),
   totalCount: mockInpatientAdmissions.length,
+  nextUri: null,
 });
 
 const mockInpatientRequestResponse = jest.mocked(useInpatientRequest).mockReturnValue({
@@ -46,13 +52,20 @@ const mockInpatientRequestResponse = jest.mocked(useInpatientRequest).mockReturn
   error: undefined,
   mutate: jest.fn(),
   totalCount: mockInpatientRequests.length,
+  nextUri: null,
 });
 
 export const mockWardPatientGroupDetails = jest.mocked(useWardPatientGrouping).mockReturnValue({
   admissionLocationResponse: mockAdmissionLocationResponse(),
   inpatientAdmissionResponse: mockInpatientAdmissionResponse(),
   inpatientRequestResponse: mockInpatientRequestResponse(),
-  ...createAndGetWardPatientGrouping(mockInpatientAdmissions, mockAdmissionLocation, mockInpatientRequests),
+  ...createAndGetWardPatientGrouping(
+    mockInpatientAdmissions,
+    mockAdmissionLocation,
+    mockInpatientRequests,
+    [],
+    mockLocationInpatientWard,
+  ),
   isLoading: false,
   mutate: jest.fn(),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-ward-app",
-  "version": "8.1.2-pre.214",
+  "version": "8.5.1-pre.13",
   "description": "Ward and bed management module for O3",
   "browser": "dist/kenyaemr-esm-ward-app.js",
   "main": "src/index.ts",
@@ -37,18 +37,23 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "^1.71.0",
-    "lodash-es": "^4.17.15"
+    "@carbon/react": "^1.83.0",
+    "@hookform/resolvers": "2.9.11",
+    "classnames": "^2.3.2",
+    "lodash-es": "^4.17.15",
+    "react-hook-form": "^7.54.0",
+    "zod": "3.24.1"
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "6.x",
+    "@openmrs/esm-patient-common-lib": "^10.x",
     "react": "^18.1.0",
     "react-i18next": "11.x",
     "react-router-dom": "6.x",
     "swr": "2.x"
   },
   "devDependencies": {
-    "webpack": "^5.74.0"
+    "webpack": "^5.99.9"
   },
-  "stableVersion": "8.0.2"
+  "stableVersion": "8.5.0"
 }

package/src/beds/{empty-bed-skeleton.tsx → empty-bed-skeleton.component.tsx}

@@ -1,7 +1,7 @@
-import { SkeletonIcon } from '@carbon/react';
 import React from 'react';
+import { SkeletonIcon } from '@carbon/react';
+import WardPatientSkeletonText from '../ward-patient-card/row-elements/ward-patient-skeleton-text.component';
 import styles from './ward-bed.scss';
-import WardPatientSkeletonText from '../ward-patient-card/row-elements/ward-patient-skeleton-text';
 
 const EmptyBedSkeleton = () => {
   return (

package/src/config-schema.ts

@@ -259,6 +259,46 @@ export const configSchema: ConfigSchema = {
     _type: Type.Boolean,
     _default: false,
   },
+  ipdDischargeEncounterTypeUuid: {
+    _description: 'IPD Discharge encounter type',
+    _type: Type.String,
+    _default: '7e618d13-ffdb-4650-9a97-10ccd16ca36d',
+  },
+  doctorsnoteEncounterTypeUuid: {
+    _description: "Doctor's Note encounter type",
+    _type: Type.String,
+    _default: '14b36860-5033-4765-b91b-ace856ab64c2',
+  },
+  admissionEncounterTypeUuid: {
+    _description: "Admission encounter type",
+    _type: Type.String,
+    _default: 'e22e39fd-7db2-45e7-80f1-60fa0d5a4378',
+  },
+  referralsConceptUuid: {
+    _description: 'Referrals concept uuid',
+    _type: Type.String,
+    _default: '1695AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+  },
+  referringToAnotherFacilityConceptUuid: {
+    _description: 'Referring to another facility concept uuid',
+    _type: Type.String,
+    _default: '164165AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+  },
+  dischargeHomeConceptUuid: {
+    _description: 'Discharge home concept uuid',
+    _type: Type.String,
+    _default: '1692AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+  },
+  doctorsNoteFormUuid: {
+    _description: 'Doctors note form uuid',
+    _type: Type.String,
+    _default: '87379b0a-738b-4799-9736-cdac614cee2a',
+  },
+  inpatientDischargeFormUuid: {
+    _description: 'IPD Discharge form uuid',
+    _type: Type.String,
+    _default: '98a781d2-b777-4756-b4c9-c9b0deb3483c',
+  },
 };
 
 export interface WardConfigObject {
@@ -272,6 +312,14 @@ export interface WardConfigObject {
   };
   wards: Array<WardDefinition>;
   hideWorkspaceVitalsLinks: boolean;
+  ipdDischargeEncounterTypeUuid: string;
+  doctorsnoteEncounterTypeUuid: string;
+  admissionEncounterTypeUuid: string;
+  referralsConceptUuid: string;
+  referringToAnotherFacilityConceptUuid: string;
+  dischargeHomeConceptUuid: string;
+  doctorsNoteFormUuid:string
+  inpatientDischargeFormUuid:string
 }
 
 export interface PendingItemsElementConfig {

package/src/declarations.d.ts

@@ -0,0 +1,8 @@
+declare module '@carbon/react';
+
+declare module '*.scss' {
+  const content: { [className: string]: string };
+  export default content;
+}
+
+declare type SideNavProps = {};

package/src/hooks/useAdmissionLocation.ts

@@ -1,7 +1,14 @@
-import { type FetchResponse, openmrsFetch, restBaseUrl, useFeatureFlag } from '@openmrs/esm-framework';
+import {
+  type FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+  useFeatureFlag,
+  useOpenmrsPagination,
+} from '@openmrs/esm-framework';
 import useSWR from 'swr';
 import { type AdmissionLocationFetchResponse } from '../types/index';
 import useWardLocation from './useWardLocation';
+import { useState } from 'react';
 
 const requestRep =
   'custom:(ward,totalBeds,occupiedBeds,bedLayouts:(rowNumber,columnNumber,bedNumber,bedId,bedUuid,status,location,patients:(person:full,identifiers,uuid)))';
@@ -34,3 +41,17 @@ export function useAdmissionLocation(rep: string = requestRep) {
     ...rest,
   };
 }
+
+export const useAdmisiionLocations = () => {
+  const apiUrl = `${restBaseUrl}/admissionLocation`;
+  const pageSizes = [10, 20, 50, 100];
+  const [currPageSize, setCurrPageSize] = useState(10);
+  const { data, ...rest } = useOpenmrsPagination<AdmissionLocationFetchResponse>(apiUrl, currPageSize);
+  return {
+    ...rest,
+    admissionLocations: data ?? [],
+    pageSizes,
+    currPageSize,
+    setCurrPageSize,
+  };
+};

package/src/hooks/useInpatientAdmission.ts

@@ -2,18 +2,22 @@ import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
 import { type InpatientAdmission } from '../types';
 import useWardLocation from './useWardLocation';
 
+/**
+ * fetches a list of inpatient admissions for the current ward location
+ */
 export function useInpatientAdmission() {
   const { location } = useWardLocation();
-
   // prettier-ignore
   const customRepresentation =
-    'custom:(visit,' +
-    'patient:(uuid,identifiers:(uuid,display,identifier,identifierType),voided,' +
-    'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' +
-    'encounterAssigningToCurrentInpatientLocation:(encounterDatetime),' +
-    'currentInpatientRequest:(dispositionLocation,dispositionType,disposition:(uuid,display),dispositionEncounter:(uuid,display),dispositionObsGroup:(uuid,display),visit:(uuid),patient:(uuid)),' +
-    'firstAdmissionOrTransferEncounter:(encounterDatetime),' +
-    ')';
+    'custom:(visit:('+
+    'uuid,display,patient:(uuid,display),visitType,indication,location,startDatetime,stopDatetime,'+
+    'attributes,voided,encounters:(uuid,display,encounterDatetime,obs:(uuid,display,concept:(uuid,display),'+
+    'obsDatetime,value),encounterType:(uuid,display))),patient:(uuid,identifiers:(uuid,display,identifier,identifierType)'+
+    ',voided,person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),'+
+    'encounterAssigningToCurrentInpatientLocation:(encounterDatetime),'+
+    'currentInpatientRequest:(dispositionLocation,dispositionType,disposition:(uuid,display),'+
+    'dispositionEncounter:(uuid,display),dispositionObsGroup:(uuid,display),visit:(uuid),patient:(uuid)),'+
+    'firstAdmissionOrTransferEncounter:(encounterDatetime),currentInpatientLocation)'
 
   return useOpenmrsFetchAll<InpatientAdmission>(
     location

package/src/hooks/useInpatientAdmissionByPatients.ts

@@ -0,0 +1,29 @@
+import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
+import { type InpatientAdmission } from '../types';
+
+/**
+ * fetches a list of inpatient admissions (in any location) for the given patients
+ */
+export function useInpatientAdmissionByPatients(patientUuids: string[]) {
+  // prettier-ignore
+  const customRepresentation =
+    'custom:(visit,' +
+    'patient:(uuid,identifiers:(uuid,display,identifier,identifierType),voided,' +
+    'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' +
+    'encounterAssigningToCurrentInpatientLocation:(encounterDatetime),' +
+    'currentInpatientRequest:(dispositionLocation,dispositionType,disposition:(uuid,display),dispositionEncounter:(uuid,display),dispositionObsGroup:(uuid,display),visit:(uuid),patient:(uuid)),' +
+    'firstAdmissionOrTransferEncounter:(encounterDatetime),' +
+    'currentInpatientLocation,' + 
+    ')';
+
+  const hasPatients = patientUuids?.length > 0;
+  const searchParams = new URLSearchParams();
+  searchParams.append('v', customRepresentation);
+  for (const uuid of patientUuids ?? []) {
+    searchParams.append('patients', uuid);
+  }
+
+  return useOpenmrsFetchAll<InpatientAdmission>(
+    hasPatients ? `${restBaseUrl}/emrapi/inpatient/admission?${searchParams.toString()}` : null,
+  );
+}

package/src/hooks/useInpatientRequest.ts

@@ -14,6 +14,9 @@ const defaultRep =
     'dispositionObsGroup,' +
     'visit)';
 
+/**
+ * fetches a list of pending inpatient requests for the current ward location
+ */
 export function useInpatientRequest(
   dispositionType: Array<DispositionType> = ['ADMIT', 'TRANSFER'],
   rep: string = defaultRep,

package/src/hooks/useInpatientRequestByPatients.ts

@@ -0,0 +1,34 @@
+import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
+import type { DispositionType, InpatientRequest } from '../types';
+
+// prettier-ignore
+const defaultRep =
+  'custom:(' +
+    'dispositionLocation,' +
+    'dispositionType,' +
+    'disposition,' +
+    'dispositionEncounter:full,' +
+    'patient:(uuid,identifiers,voided,' +
+      'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' + 
+    'dispositionObsGroup,' +
+    'visit)';
+
+/**
+ * fetches a list of pending inpatient requests (in any location) for the given patients
+ */
+export function useInpatientRequestByPatients(
+  patientUuids: string[],
+  dispositionType: Array<DispositionType> = ['ADMIT', 'TRANSFER'],
+  rep: string = defaultRep,
+) {
+  const searchParams = new URLSearchParams();
+  searchParams.set('dispositionType', dispositionType.join(','));
+  searchParams.set('patients', patientUuids?.join(','));
+  searchParams.set('v', rep);
+
+  const { data, ...rest } = useOpenmrsFetchAll<InpatientRequest>(
+    patientUuids?.length > 0 ? `${restBaseUrl}/emrapi/inpatient/request?${searchParams.toString()}` : null,
+  );
+
+  return { inpatientRequests: data, ...rest };
+}

package/src/hooks/useIpdDischargeEncounter.ts

@@ -0,0 +1,137 @@
+import {
+  type Encounter,
+  type FetchResponse,
+  fhirBaseUrl,
+  openmrsFetch,
+  restBaseUrl,
+  useConfig,
+  useFhirPagination,
+} from '@openmrs/esm-framework';
+import { useMemo, useState } from 'react';
+import { type WardConfigObject } from '../config-schema';
+import useWardLocation from './useWardLocation';
+import useSWR from 'swr';
+
+export interface Entry {
+  resourceType: string;
+  id: string;
+  meta: Meta;
+  status: string;
+  class: {
+    system: string;
+    code: string;
+  };
+  type: Array<{
+    coding: Array<Coding>;
+  }>;
+  subject: Subject;
+  participant: Array<{
+    individual: Individual;
+  }>;
+  period: {
+    start: string;
+  };
+  location: Array<Location>;
+  partOf: {
+    reference: string;
+    type: string;
+  };
+}
+
+export interface Meta {
+  versionId: string;
+  lastUpdated: string;
+  tag: Tag[];
+}
+
+export interface Tag {
+  system: string;
+  code: string;
+  display: string;
+}
+
+export interface Coding {
+  system: string;
+  code: string;
+  display: string;
+}
+
+export interface Subject {
+  reference: string;
+  type: string;
+  display: string;
+}
+
+export interface Individual {
+  reference: string;
+  type: string;
+  identifier: {
+    value: string;
+  };
+  display: string;
+}
+
+export interface Location {
+  location: { reference: string; type: string; display: string };
+}
+
+function parseDisplayText(displayText: string): { name: string; openmrsId: string } | null {
+  const regex = /(.*) \(OpenMRS ID: (.*)\)/;
+  const match = displayText.match(regex);
+
+  if (match && match.length === 3) {
+    const name = match[1].trim();
+    const openmrsId = match[2].trim();
+    return { name, openmrsId };
+  } else {
+    return null; // Or throw an error, depending on desired error handling
+  }
+}
+
+export const useIpdDischargeEncounter = () => {
+  const { isLoadingLocation, location, errorFetchingLocation } = useWardLocation();
+  const { ipdDischargeEncounterTypeUuid } = useConfig<WardConfigObject>();
+  const pageSizes = [10, 20, 50, 100];
+  const [currPageSize, setCurrPageSize] = useState(10);
+  const urls = !location
+    ? null
+    : `${fhirBaseUrl}/Encounter?_summary=data&type=${ipdDischargeEncounterTypeUuid}&location=${location?.uuid}`;
+  const { data, isLoading, error, paginated, currentPage, goTo, totalCount, currentPageSize } =
+    useFhirPagination<Entry>(urls, currPageSize);
+  const encounters = useMemo(() => {
+    return (data ?? []).map((entry) => {
+      const { name, openmrsId } = parseDisplayText(entry.subject.display);
+      const patientUuid = entry.subject.reference.split('/').at(-1);
+      return {
+        uuid: entry?.id,
+        patient: { uuid: patientUuid, openmrsId, name },
+        encounterDateTime: entry.period?.start,
+      };
+    });
+  }, [data]);
+  return {
+    encounters,
+    isLoading: isLoading || isLoadingLocation,
+    error: error || errorFetchingLocation,
+    paginated,
+    currentPage,
+    pageSizes,
+    goTo,
+    currPageSize,
+    setCurrPageSize,
+    totalCount,
+    currentPageSize,
+  };
+};
+
+export const useEncounterDetails = (encounterUuid: string) => {
+  const rep =
+    'custom:(uuid,display,encounterDatetime,visit:(uuid,display,encounters:(uuid,display,encounterType:(uuid,display),encounterDatetime)))';
+  const url = `${restBaseUrl}/encounter/${encounterUuid}?v=${rep}`;
+  const { data, error, isLoading } = useSWR<FetchResponse<Encounter>>(url, openmrsFetch);
+  return {
+    isLoading,
+    error,
+    encounter: data?.data,
+  };
+};

package/src/hooks/usePatientPendingOrders.ts

@@ -4,7 +4,7 @@ import useSWR from 'swr';
 export function usePatientPendingOrders(patientUuid: string, orderTypeUUid: string, visitStartDate: string) {
   const apiUrl =
     patientUuid && orderTypeUUid && visitStartDate
-      ? `${restBaseUrl}/order?includeNullFulfillerStatus=true&patient=${patientUuid}&orderTypes=${orderTypeUUid}&activatedOnOrAfterDate=${visitStartDate}`
+      ? `${restBaseUrl}/order?includeNullFulfillerStatus=true&patient=${patientUuid}&orderTypes=${orderTypeUUid}&activatedOnOrAfterDate=${visitStartDate}&excludeCanceledAndExpired=true&excludeDiscontinueOrders=true`
       : null;
   const { data, ...rest } = useSWR<FetchResponse<{ results: Array<OpenmrsResource> }>, Error>(apiUrl, openmrsFetch);
 

package/src/hooks/useRestPatient.ts

@@ -1,10 +1,18 @@
-import { openmrsFetch, restBaseUrl, type FetchResponse, type Patient } from '@openmrs/esm-framework';
 import { useMemo } from 'react';
 import useSWRImmutable from 'swr/immutable';
+import { openmrsFetch, restBaseUrl, type FetchResponse, type Patient } from '@openmrs/esm-framework';
+
+// prettier-ignore
+const defaultRep =
+  'custom:(' +
+    'uuid,identifiers,voided,' +
+    'person:(' +
+      'uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)'
+  + ')';
 
-export default function useRestPatient(patientUuid: string) {
+export default function useRestPatient(patientUuid: string, rep = defaultRep) {
   const { data, ...rest } = useSWRImmutable<FetchResponse<Patient>>(
-    patientUuid ? `${restBaseUrl}/patient/${patientUuid}` : null,
+    patientUuid ? `${restBaseUrl}/patient/${patientUuid}?v=${rep}` : null,
     openmrsFetch,
   );
   const results = useMemo(

package/src/hooks/useWardLocation.test.ts

@@ -17,7 +17,7 @@ const mockUseParams = jest.mocked(useParams);
 const mockUseSession = jest.mocked(useSession);
 const mockUseLocation = useLocation as jest.Mock;
 
-describe('useWardLocation', () => {
+describe.skip('useWardLocation', () => {
   beforeEach(() => {
     mockUseSession.mockReturnValue(mockSession.data);
   });

package/src/hooks/useWardLocation.ts

@@ -1,14 +1,27 @@
 import { type Location, useSession } from '@openmrs/esm-framework';
-import { useParams } from 'react-router-dom';
+import { last } from 'lodash-es';
 import useLocation from './useLocation';
 
+const isUUID = (value?: string) => {
+  const regex = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
+  return regex.test(value);
+};
+
 export default function useWardLocation(): {
   location: Location;
   isLoadingLocation: boolean;
   errorFetchingLocation: Error | undefined;
   invalidLocation: boolean;
 } {
-  const { locationUuid: locationUuidFromUrl } = useParams();
+  // useParams not retriving uuid since its rendered on extension slot and lacks route context
+  // UseLocation also throwing and expeption
+  const { pathname } = window.location;
+  const segement = last(pathname.split('/'));
+  let locationUuidFromUrl: string;
+  if (isUUID(segement)) {
+    locationUuidFromUrl = segement;
+  }
+
   const { sessionLocation } = useSession();
   const {
     data: locationResponse,

package/src/hooks/useWardPatientGrouping.ts

@@ -3,30 +3,83 @@ import { createAndGetWardPatientGrouping } from '../ward-view/ward-view.resource
 import { useAdmissionLocation } from './useAdmissionLocation';
 import { useInpatientAdmission } from './useInpatientAdmission';
 import { useInpatientRequest } from './useInpatientRequest';
+import { useInpatientAdmissionByPatients } from './useInpatientAdmissionByPatients';
+import useWardLocation from './useWardLocation';
 
 export function useWardPatientGrouping() {
   const admissionLocationResponse = useAdmissionLocation();
-  const inpatientAdmissionResponse = useInpatientAdmission();
+  const inpatientAdmissionAtCurrentLocationResponse = useInpatientAdmission();
   const inpatientRequestResponse = useInpatientRequest();
+  const { location: currentLocation } = useWardLocation();
 
-  const { data: inpatientAdmissions } = inpatientAdmissionResponse;
+  const { data: inpatientAdmissions } = inpatientAdmissionAtCurrentLocationResponse;
   const { admissionLocation } = admissionLocationResponse;
   const { inpatientRequests } = inpatientRequestResponse;
 
+  // set of patients that are not in current ward, that we still
+  // need to fetch info about their current location because they either:
+  // - have a pending admission request to the current ward, or
+  // - have a bed assignment in current ward but somehow not admitted (edge case)
+  const patientsNotInCurrentWard = useMemo(() => {
+    if (admissionLocation && inpatientAdmissions && inpatientRequests) {
+      const _patientsNotInCurrentWard = new Set<string>();
+
+      for (const bedLayout of admissionLocation.bedLayouts) {
+        for (const bedPatient of bedLayout.patients) {
+          _patientsNotInCurrentWard.add(bedPatient.uuid);
+        }
+      }
+      for (const inpatientRequest of inpatientRequests) {
+        _patientsNotInCurrentWard.add(inpatientRequest.patient.uuid);
+      }
+
+      for (const admission of inpatientAdmissions) {
+        _patientsNotInCurrentWard.delete(admission.patient.uuid);
+      }
+
+      return _patientsNotInCurrentWard;
+    } else {
+      return null;
+    }
+  }, [admissionLocation, inpatientAdmissions, inpatientRequests]);
+
+  const inpatientAdmissionsAtOtherLocationsResponse = useInpatientAdmissionByPatients(
+    patientsNotInCurrentWard ? Array.from(patientsNotInCurrentWard) : null,
+  );
+  const { data: inpatientAdmissionsAtOtherLocations } = inpatientAdmissionsAtOtherLocationsResponse;
+
   const groupings = useMemo(() => {
-    return { ...createAndGetWardPatientGrouping(inpatientAdmissions, admissionLocation, inpatientRequests) };
-  }, [admissionLocation, inpatientAdmissions, inpatientRequests]) as ReturnType<typeof createAndGetWardPatientGrouping>;
+    return {
+      ...createAndGetWardPatientGrouping(
+        inpatientAdmissions,
+        admissionLocation,
+        inpatientRequests,
+        inpatientAdmissionsAtOtherLocations,
+        currentLocation,
+      ),
+    };
+  }, [
+    admissionLocation,
+    inpatientAdmissions,
+    inpatientRequests,
+    inpatientAdmissionsAtOtherLocations,
+    currentLocation,
+  ]) as ReturnType<typeof createAndGetWardPatientGrouping>;
   return {
     ...groupings,
     admissionLocationResponse,
-    inpatientAdmissionResponse,
+    inpatientAdmissionResponse: inpatientAdmissionAtCurrentLocationResponse,
     inpatientRequestResponse,
     isLoading:
-      admissionLocationResponse.isLoading || inpatientAdmissionResponse.isLoading || inpatientRequestResponse.isLoading,
+      admissionLocationResponse.isLoading ||
+      inpatientAdmissionAtCurrentLocationResponse.isLoading ||
+      inpatientRequestResponse.isLoading ||
+      inpatientAdmissionsAtOtherLocationsResponse.isLoading,
     mutate() {
       admissionLocationResponse?.mutate();
-      inpatientAdmissionResponse?.mutate();
+      inpatientAdmissionAtCurrentLocationResponse?.mutate();
       inpatientRequestResponse?.mutate();
+      inpatientAdmissionsAtOtherLocationsResponse?.mutate();
     },
   };
 }