@openmrs/esm-ward-app 9.2.1-pre.7380 → 9.2.1-pre.7385

package/dist/openmrs-esm-ward-app.js.buildmanifest.json

@@ -54,9 +54,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 79640,
+      "size": 79800,
       "sizes": {
-        "javascript": 79640
+        "javascript": 79800
       },
       "names": [],
       "idHints": [],
@@ -70,7 +70,7 @@
       "auxiliaryFiles": [
         "380.js.map"
       ],
-      "hash": "d534c018b2e69fb3",
+      "hash": "79056e43226a2b27",
       "childrenByOrder": {}
     },
     {
@@ -427,9 +427,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 92524,
+      "size": 93159,
       "sizes": {
-        "javascript": 92524
+        "javascript": 93159
       },
       "names": [],
       "idHints": [],
@@ -443,7 +443,7 @@
       "auxiliaryFiles": [
         "1987.js.map"
       ],
-      "hash": "1b74d8a7c44c8be5",
+      "hash": "2befe6e4e163dad5",
       "childrenByOrder": {}
     },
     {
@@ -974,9 +974,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6354,
+      "size": 6356,
       "sizes": {
-        "javascript": 6354
+        "javascript": 6356
       },
       "names": [],
       "idHints": [],
@@ -988,7 +988,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "15bc9d4f77b3e1f3",
+      "hash": "6db67bdb6e02ce9b",
       "childrenByOrder": {}
     },
     {
@@ -1495,9 +1495,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 17354,
+      "size": 17623,
       "sizes": {
-        "javascript": 17354
+        "javascript": 17623
       },
       "names": [],
       "idHints": [],
@@ -1510,7 +1510,7 @@
       "auxiliaryFiles": [
         "7512.js.map"
       ],
-      "hash": "58a11293a52b3c71",
+      "hash": "b4945fd0ebf15fd2",
       "childrenByOrder": {}
     },
     {
@@ -1518,9 +1518,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 23081,
+      "size": 23241,
       "sizes": {
-        "javascript": 23081
+        "javascript": 23241
       },
       "names": [],
       "idHints": [],
@@ -1534,7 +1534,7 @@
       "auxiliaryFiles": [
         "7524.js.map"
       ],
-      "hash": "ce621d64a54f7f84",
+      "hash": "8061f1027d3884df",
       "childrenByOrder": {}
     },
     {
@@ -1773,9 +1773,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 252402,
+      "size": 252403,
       "sizes": {
-        "javascript": 252402
+        "javascript": 252403
       },
       "names": [],
       "idHints": [],
@@ -1789,7 +1789,7 @@
       "auxiliaryFiles": [
         "8610.js.map"
       ],
-      "hash": "c2a11899f73673e8",
+      "hash": "e1b21ada3f832b18",
       "childrenByOrder": {}
     },
     {
@@ -1846,10 +1846,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 39521,
+      "size": 39790,
       "sizes": {
         "consume-shared": 126,
-        "javascript": 17354,
+        "javascript": 17623,
         "share-init": 294,
         "runtime": 21747
       },
@@ -1866,7 +1866,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "7000e8e8b56ff6ad",
+      "hash": "03a62be626009fce",
       "childrenByOrder": {}
     },
     {
@@ -2015,9 +2015,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 23863,
+      "size": 24023,
       "sizes": {
-        "javascript": 23863
+        "javascript": 24023
       },
       "names": [],
       "idHints": [],
@@ -2031,7 +2031,7 @@
       "auxiliaryFiles": [
         "9775.js.map"
       ],
-      "hash": "73a23ac00dcfb7da",
+      "hash": "2c15e69f68e3b3d2",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","emrapi":">=2.0.0 <4.0.0"},"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":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"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"}],"workspaces2":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","window":"pending-admissions"},{"name":"transfer-elsewhere-workspace","component":"patientTransferRequestWorkspace","window":"pending-admissions"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","window":"pending-admissions"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","window":"pending-admissions"},{"name":"ward-app-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"add-patient-to-ward"},{"name":"ward-app-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"add-patient-to-ward"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","window":"add-patient-to-ward"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","window":"ward-patient"},{"name":"ward-patient-vitals-workspace","component":"@openmrs/esm-patient-vitals-app#exportedVitalsBiometricsFormWorkspace","window":"ward-patient"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","window":"ward-patient-notes"},{"name":"ward-patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","window":"ward-patient-transfer-swap"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","window":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"@openmrs/esm-patient-forms-app#exportedClinicalFormsWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-cancel-admission-request-workspace","component":"wardPatientCancelAdmissionRequestWorkspace","window":"ward-patient-cancel-admission-request"},{"name":"ward-patient-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-general-order-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"}],"workspaceWindows2":[{"name":"pending-admissions","group":"ward-manage-admissions","icon":"admissionRequestsWorkspaceSideRailIcon","width":"wider"},{"name":"add-patient-to-ward","group":"ward-manage-admissions","icon":"createAdmissionEncounterWorkspaceSideRailIcon"},{"name":"ward-patient","group":"ward-patient","icon":"wardPatientActionButton","width":"wider"},{"name":"ward-patient-notes","group":"ward-patient","icon":"wardPatientNotesActionButton"},{"name":"ward-patient-transfer-swap","group":"ward-patient","icon":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"ward-patient-discharge","group":"ward-patient","icon":"patientDischargeWorkspaceSideRailIcon"},{"name":"ward-patient-clinical-forms","group":"ward-patient","icon":"clinicalFormWorkspaceSideRailIcon"},{"name":"ward-patient-order-basket","group":"ward-patient","icon":"orderBasketWorkspaceSideRailIcon"},{"name":"ward-patient-cancel-admission-request","group":"ward-patient"}],"workspaceGroups2":[{"name":"ward-manage-admissions","overlay":true,"persistence":"closable"},{"name":"ward-patient","overlay":true,"persistence":"closable"}],"version":"9.2.1-pre.7380"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","emrapi":">=2.0.0 <4.0.0"},"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":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"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"}],"workspaces2":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","window":"pending-admissions"},{"name":"transfer-elsewhere-workspace","component":"patientTransferRequestWorkspace","window":"pending-admissions"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","window":"pending-admissions"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","window":"pending-admissions"},{"name":"ward-app-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"add-patient-to-ward"},{"name":"ward-app-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"add-patient-to-ward"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","window":"add-patient-to-ward"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","window":"ward-patient"},{"name":"ward-patient-vitals-workspace","component":"@openmrs/esm-patient-vitals-app#exportedVitalsBiometricsFormWorkspace","window":"ward-patient"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","window":"ward-patient-notes"},{"name":"ward-patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","window":"ward-patient-transfer-swap"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","window":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"@openmrs/esm-patient-forms-app#exportedClinicalFormsWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-cancel-admission-request-workspace","component":"wardPatientCancelAdmissionRequestWorkspace","window":"ward-patient-cancel-admission-request"},{"name":"ward-patient-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-general-order-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"}],"workspaceWindows2":[{"name":"pending-admissions","group":"ward-manage-admissions","icon":"admissionRequestsWorkspaceSideRailIcon","width":"wider"},{"name":"add-patient-to-ward","group":"ward-manage-admissions","icon":"createAdmissionEncounterWorkspaceSideRailIcon"},{"name":"ward-patient","group":"ward-patient","icon":"wardPatientActionButton","width":"wider"},{"name":"ward-patient-notes","group":"ward-patient","icon":"wardPatientNotesActionButton"},{"name":"ward-patient-transfer-swap","group":"ward-patient","icon":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"ward-patient-discharge","group":"ward-patient","icon":"patientDischargeWorkspaceSideRailIcon"},{"name":"ward-patient-clinical-forms","group":"ward-patient","icon":"clinicalFormWorkspaceSideRailIcon"},{"name":"ward-patient-order-basket","group":"ward-patient","icon":"orderBasketWorkspaceSideRailIcon"},{"name":"ward-patient-cancel-admission-request","group":"ward-patient"}],"workspaceGroups2":[{"name":"ward-manage-admissions","overlay":true,"persistence":"closable"},{"name":"ward-patient","overlay":true,"persistence":"closable"}],"version":"9.2.1-pre.7385"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-ward-app",
-  "version": "9.2.1-pre.7380",
+  "version": "9.2.1-pre.7385",
   "description": "Ward and bed management module for O3",
   "browser": "dist/openmrs-esm-ward-app.js",
   "main": "src/index.ts",

package/src/config-schema.ts

@@ -257,6 +257,12 @@ export const configSchema = {
     _default: false,
     _description: 'Configure whether to hide vital history and record vital links in the ward patient workspace.',
   },
+  additionalInpatientNotesConceptUuids: {
+    _type: Type.Array,
+    _default: [],
+    _description:
+      'List of uuids of concepts that represent notes to display in the notes view in addition to the consultFreeTextCommentsConcept defined by EMR-API',
+  },
 };
 
 export interface WardConfigObject {
@@ -270,6 +276,7 @@ export interface WardConfigObject {
   };
   wards: Array<WardDefinition>;
   hideWorkspaceVitalsLinks: boolean;
+  additionalInpatientNotesConceptUuids: Array<string>;
 }
 
 export interface PendingItemsElementConfig {

package/src/types/index.ts

@@ -1,6 +1,5 @@
 import type {
   Concept,
-  DefaultWorkspaceProps,
   Location,
   OpenmrsResource,
   OpenmrsResourceStrict,
@@ -230,7 +229,7 @@ export interface EncounterRole extends OpenmrsResourceStrict {
 export interface WardMetrics {
   patients: string;
   freeBeds: string;
-  capacity: string;
+  totalBeds: string;
 }
 
 export interface EncounterPayload {

package/src/ward-view/ward-view.resource.ts

@@ -47,21 +47,13 @@ export function filterBeds(admissionLocation: AdmissionLocationFetchResponse): B
 }
 
 export function getWardMetrics(bedLayouts: BedLayout[], wardPatientGroup: WardPatientGroupDetails): WardMetrics {
-  const bedMetrics = {
-    patients: '--',
-    freeBeds: '--',
-    capacity: '--',
-  };
-  if (bedLayouts == null || bedLayouts.length == 0) return bedMetrics;
-  const total = bedLayouts.length;
-  const occupiedBeds = bedLayouts.filter((bed) => bed.patients.length > 0);
-  const patients = occupiedBeds.length;
-  const freeBeds = total - patients;
-  const capacity = total != 0 ? Math.trunc((wardPatientGroup.totalPatientsCount / total) * 100) : 0;
+  const patients = wardPatientGroup?.totalPatientsCount ?? 0;
+  const totalBeds = bedLayouts?.length ?? 0;
+  const occupiedBeds = bedLayouts?.filter((bed) => bed.patients?.length > 0).length ?? 0;
   return {
-    patients: wardPatientGroup?.totalPatientsCount.toString() ?? '--',
-    freeBeds: freeBeds.toString(),
-    capacity: capacity.toString(),
+    patients: patients.toString(),
+    freeBeds: (totalBeds - occupiedBeds).toString(),
+    totalBeds: totalBeds.toString(),
   };
 }
 
@@ -146,8 +138,8 @@ export function getWardMetricNameTranslation(name: string, t: TFunction) {
       return t('patients', 'Patients');
     case 'freeBeds':
       return t('freeBeds', 'Free beds');
-    case 'capacity':
-      return t('capacity', 'Capacity');
+    case 'totalBeds':
+      return t('totalBeds', 'Total beds');
     case 'pendingOut':
       return t('pendingOut', 'Pending out');
   }
@@ -159,8 +151,8 @@ export function getWardMetricValueTranslation(name: string, t: TFunction, value:
       return t('patientsMetricValue', '{{ metricValue }}', { metricValue: value });
     case 'freeBeds':
       return t('freeBedsMetricValue', '{{ metricValue }}', { metricValue: value });
-    case 'capacity':
-      return t('capacityMetricValue', '{{ metricValue }} %', { metricValue: value });
+    case 'totalBeds':
+      return t('totalBedsMetricValue', '{{ metricValue }}', { metricValue: value });
     case 'pendingOut':
       return t('pendingOutMetricValue', '{{ metricValue }}', { metricValue: value });
   }

package/src/ward-view-header/ward-metrics.component.tsx

@@ -10,7 +10,7 @@ import {
 import WardMetric from './ward-metric.component';
 import styles from './ward-metrics.scss';
 
-const wardMetrics = [{ name: 'patients' }, { name: 'freeBeds' }, { name: 'capacity' }];
+const wardMetrics = [{ name: 'patients' }, { name: 'freeBeds' }, { name: 'totalBeds' }];
 
 const WardMetrics = () => {
   const { t } = useTranslation();

package/src/ward-view-header/ward-metrics.test.tsx

@@ -10,7 +10,7 @@ import WardMetrics from './ward-metrics.component';
 const wardMetrics = [
   { name: 'patients', key: 'patients', defaultTranslation: 'Patients' },
   { name: 'freeBeds', key: 'freeBeds', defaultTranslation: 'Free beds' },
-  { name: 'capacity', key: 'capacity', defaultTranslation: 'Capacity' },
+  { name: 'totalBeds', key: 'totalBeds', defaultTranslation: 'Total beds' },
 ];
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
-import { SkeletonText, Tag, Tile } from '@carbon/react';
+import { SkeletonText, Tile } from '@carbon/react';
 import { type PatientNote } from '../types';
 import styles from './styles.scss';
 
@@ -38,12 +38,6 @@ const InPatientNote: React.FC<InPatientNoteProps> = ({ note }) => {
           {formattedDate}, {formattedTime}
         </span>
       </div>
-      {note.diagnoses &&
-        note.diagnoses.split(',').map((diagnosis, index) => (
-          <Tag key={index} type="red">
-            {diagnosis.trim()}
-          </Tag>
-        ))}
       <div className={styles.noteBody}>{note.encounterNote}</div>
       <div className={styles.noteProviderName}>{note.encounterProvider}</div>
     </Tile>

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

@@ -1,11 +1,12 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { type PatientUuid } from '@openmrs/esm-framework';
+import { type PatientUuid, useConfig } from '@openmrs/esm-framework';
 import { usePatientNotes } from '../notes.resource';
 import InPatientNote, { InPatientNoteSkeleton } from './note.component';
 import styles from './styles.scss';
 import { InlineNotification } from '@carbon/react';
 import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
+import { type WardConfigObject } from '../../../config-schema';
 
 interface PatientNotesHistoryProps {
   patientUuid: PatientUuid;
@@ -15,13 +16,12 @@ interface PatientNotesHistoryProps {
 const PatientNotesHistory: React.FC<PatientNotesHistoryProps> = ({ patientUuid, visitUuid }) => {
   const { t } = useTranslation();
   const { emrConfiguration, isLoadingEmrConfiguration } = useEmrConfiguration();
+  const config = useConfig<WardConfigObject>();
 
-  const { patientNotes, isLoadingPatientNotes, errorFetchingPatientNotes } = usePatientNotes(
-    patientUuid,
-    visitUuid,
-    emrConfiguration?.inpatientNoteEncounterType?.uuid,
+  const { patientNotes, isLoadingPatientNotes, errorFetchingPatientNotes } = usePatientNotes(patientUuid, visitUuid, [
     emrConfiguration?.consultFreeTextCommentsConcept.uuid,
-  );
+    ...config.additionalInpatientNotesConceptUuids,
+  ]);
 
   const isLoading = isLoadingPatientNotes || isLoadingEmrConfiguration;
 

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

@@ -4,6 +4,10 @@ import PatientNotesHistory from './notes-container.component';
 import { usePatientNotes } from '../notes.resource';
 import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
 import { emrConfigurationMock } from '__mocks__';
+import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { configSchema, type WardConfigObject } from '../../../config-schema';
+
+const mockUseConfig = jest.mocked(useConfig<WardConfigObject>);
 
 const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
 
@@ -19,26 +23,23 @@ const mockPatientNotes = [
   {
     id: 'note-1',
     diagnoses: '',
-    encounterDate: '2024-08-01',
     encounterNote: 'Patient shows improvement with current medication.',
     encounterNoteRecordedAt: '2024-08-01T12:34:56Z',
     encounterProvider: 'Dr. John Doe',
-    encounterProviderRole: 'Endocrinologist',
   },
   {
     id: 'note-2',
     diagnoses: '',
-    encounterDate: '2024-08-02',
     encounterNote: 'Blood pressure is slightly elevated. Consider adjusting medication.',
     encounterNoteRecordedAt: '2024-08-02T14:22:00Z',
     encounterProvider: 'Dr. Jane Smith',
-    encounterProviderRole: 'Cardiologist',
   },
 ];
 
 describe('PatientNotesHistory', () => {
   beforeEach(() => {
     jest.resetAllMocks();
+    mockUseConfig.mockReturnValue(getDefaultsFromConfigSchema<WardConfigObject>(configSchema));
   });
 
   test('displays loading skeletons when loading', () => {

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

@@ -14,46 +14,38 @@ export function savePatientNote(payload: EncounterPayload, abortController: Abor
   });
 }
 
-export function usePatientNotes(
-  patientUuid: string,
-  visitUuid: string,
-  encounterType: string,
-  conceptUuid: string,
-): UsePatientNotes {
+export function usePatientNotes(patientUuid: string, visitUuid: string, conceptUuids: Array<string>): UsePatientNotes {
   const customRepresentation =
-    'custom:(uuid,display,encounterDatetime,patient,obs,' +
-    'encounterProviders:(uuid,display,' +
-    'encounterRole:(uuid,display),' +
-    'provider:(uuid,person:(uuid,display))),' +
-    'diagnoses';
-  const encountersApiUrl = `${restBaseUrl}/encounter?patient=${patientUuid}&encounterType=${encounterType}&visit=${visitUuid}&v=${customRepresentation}`;
+    'custom:(uuid,patient:(uuid),obs:(uuid,concept:(uuid),obsDatetime,value:(uuid)),' +
+    'encounterProviders:(uuid,provider:(uuid,person:(uuid,display)))';
+  const encountersApiUrl = `${restBaseUrl}/encounter?patient=${patientUuid}&visit=${visitUuid}&v=${customRepresentation}`;
 
   const { data, error, isLoading, isValidating, mutate } = useOpenmrsFetchAll<RESTPatientNote>(
-    patientUuid && encounterType ? encountersApiUrl : null,
+    patientUuid ? encountersApiUrl : null,
   );
 
   const patientNotes: Array<PatientNote> | null = useMemo(
     () =>
       data
         ? data
-            .map((encounter) => {
-              const noteObs = encounter.obs.find((obs) => obs.concept.uuid === conceptUuid);
-
-              return {
-                id: encounter.uuid,
-                diagnoses: encounter.diagnoses.map((d) => d.display).join(', '),
-                encounterDate: encounter.encounterDatetime,
-                encounterNote: noteObs ? noteObs.value : '',
-                encounterNoteRecordedAt: noteObs ? noteObs.obsDatetime : '',
-                encounterProvider: encounter.encounterProviders.map((ep) => ep.provider.person.display).join(', '),
-                encounterProviderRole: encounter.encounterProviders.map((ep) => ep.encounterRole.display).join(', '),
-              };
+            .flatMap((encounter) => {
+              return encounter.obs?.reduce((acc, obs) => {
+                if (conceptUuids.includes(obs.concept.uuid)) {
+                  acc.push({
+                    id: encounter.uuid,
+                    encounterNote: obs ? obs.value : '',
+                    encounterNoteRecordedAt: obs ? obs.obsDatetime : '',
+                    encounterProvider: encounter.encounterProviders.map((ep) => ep.provider.person.display).join(', '),
+                  });
+                }
+                return acc;
+              }, []);
             })
             .sort(
               (a, b) => new Date(b.encounterNoteRecordedAt).getTime() - new Date(a.encounterNoteRecordedAt).getTime(),
             )
         : [],
-    [data, conceptUuid],
+    [data, conceptUuids],
   );
 
   return useMemo(

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

@@ -1,12 +1,13 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { createErrorHandler, ResponsiveWrapper, showSnackbar, translateFrom, useSession } from '@openmrs/esm-framework';
+import { getDefaultsFromConfigSchema, showSnackbar, useConfig } from '@openmrs/esm-framework';
 import { savePatientNote, usePatientNotes } from './notes.resource';
 import WardPatientNotesWorkspace from './notes.workspace';
-import { emrConfigurationMock, mockInpatientRequestAlice, mockPatient, mockPatientAlice, mockSession } from '__mocks__';
+import { emrConfigurationMock, mockInpatientRequestAlice, mockPatientAlice } from '__mocks__';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import { type WardPatient, type WardPatientWorkspaceDefinition } from '../../types';
+import { configSchema, type WardConfigObject } from '../../config-schema';
 
 const mockWardPatientAlice: WardPatient = {
   visit: mockInpatientRequestAlice.visit,
@@ -41,6 +42,7 @@ jest.mock('../../hooks/useEmrConfiguration', () => jest.fn());
 
 const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
 const mockedUsePatientNotes = jest.mocked(usePatientNotes);
+const mockUseConfig = jest.mocked(useConfig<WardConfigObject>);
 
 mockedUseEmrConfiguration.mockReturnValue({
   emrConfiguration: emrConfigurationMock,
@@ -50,6 +52,7 @@ mockedUseEmrConfiguration.mockReturnValue({
 });
 
 describe('<WardPatientNotesWorkspace>', () => {
+  mockUseConfig.mockReturnValue(getDefaultsFromConfigSchema<WardConfigObject>(configSchema));
   mockedUsePatientNotes.mockReturnValue({
     patientNotes: [],
     errorFetchingPatientNotes: undefined,

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

@@ -13,12 +13,9 @@ export interface RESTPatientNote extends OpenmrsResource {
 
 export interface PatientNote {
   id: string;
-  diagnoses: string;
-  encounterDate: string;
   encounterNote: string;
   encounterNoteRecordedAt: string;
   encounterProvider: string;
-  encounterProviderRole: string;
 }
 
 export interface UsePatientNotes {

package/translations/en.json

@@ -17,8 +17,6 @@
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
   "cancelAdmissionRequest": "Cancel admission request",
-  "capacity": "Capacity",
-  "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
@@ -120,6 +118,8 @@
   "somePartsOfTheFormDidntLoad": "Some parts of the form didn't load",
   "timeOnWard": "Time on this ward: {{timeOnWard}}",
   "timeSinceAdmission": "Admitted: {{timeSinceAdmission}}",
+  "totalBeds": "Total beds",
+  "totalBedsMetricValue": "{{ metricValue }}",
   "transfer": "Transfer",
   "transferElsewhere": "Transfer elsewhere",
   "transferPatient": "Transfer patient",