@kenyaemr/esm-ward-app 8.5.1-pre.67 → 8.5.1-pre.69

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":"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":"patientDischargeDocumentPreview","name":"patient-discharge-document-preview-modal"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"},{"name":"in-patient-dashboard-link","component":"inPatientChartLink","order":7,"meta":{"slot":"patient-chart-in-patient-dashboard-slot","path":"in-patient","layoutMode":"anchored","columns":1,"columnSpan":1}},{"name":"in-patient-dashboard","slot":"patient-chart-in-patient-dashboard-slot","component":"inPatientChartDashboard","meta":{"fullWidth":false}}],"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.67"}
+{"$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":"patientDischargeDocumentPreview","name":"patient-discharge-document-preview-modal"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"},{"name":"in-patient-dashboard-link","component":"inPatientChartLink","order":7,"meta":{"slot":"patient-chart-in-patient-dashboard-slot","path":"in-patient","layoutMode":"anchored","columns":1,"columnSpan":1}},{"name":"in-patient-dashboard","slot":"patient-chart-in-patient-dashboard-slot","component":"inPatientChartDashboard","meta":{"fullWidth":false}}],"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.69"}

package/package.json

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

package/src/config-schema.ts

@@ -382,44 +382,71 @@ export const configSchema: ConfigSchema = {
       {
         label: 'Cardex Nursing Plan',
         uuid: '1f81d5e2-3569-40cf-bbb9-361a53ba409b',
+        tags: [],
       },
       {
         label: 'IPD Procedure Form',
         uuid: '2b9c2b94-0b03-416a-b312-eef49b42f72c',
+        tags: [],
       },
       {
         label: 'Newborn Unit Admission ',
         uuid: '5b0a08f5-87c1-40cc-8c09-09c33b44523d',
         hideExpression: 'ageInDays < 28',
+        tags: [],
       },
       {
         label: 'Partograph Form',
         uuid: '3791e5b7-2cdc-44fc-982b-a81135367c96',
-        hideExpression: 'age >= 10 && gender === "female"',
+        tags: [{ uuid: '7680b7ee-6880-450c-8b7e-2a748b6f9dc7', tag: 'Labour & Delivery Ward' }],
       },
       {
         uuid: '87379b0a-738b-4799-9736-cdac614cee2a',
         label: 'Doctors Note',
-      },
-      {
-        uuid: '07dc609f-e607-43d6-9dc3-8bd405c4226a',
-        label: 'Post Delivery',
+        tags: [],
       },
       {
         uuid: 'ac043326-c5f0-4d11-9e6f-f7266b3f3859',
         label: 'Post Operation',
+        tags: [],
       },
       {
         uuid: 'a14824ca-29af-4d37-b9da-6bdee39f8808',
         label: 'Pre-Operation Checklist',
+        tags: [],
       },
       {
         uuid: 'b4bfa7a3-f6ed-4339-a4ec-b076463c0696',
         label: 'Fluid Intake',
+        tags: [],
       },
       {
         uuid: '3efe6966-a011-4d24-aa43-d3051bfbb8e3',
         label: 'Initial Nursing Cardex',
+        tags: [],
+      },
+      {
+        uuid: '57b8bb54-321f-4b94-bba5-58850527bfd6',
+        label: 'Maternity inpatient form',
+        tags: [{ uuid: 'dab3c2bb-0b0b-4ebd-8f99-3ad44996d311', tag: 'Antenantal Ward' }],
+      },
+      {
+        uuid: '98a781d2-b777-4756-b4c9-c9b0deb3483c',
+        label: 'Inpatient Discharge form',
+        tags: [
+          { uuid: 'dab3c2bb-0b0b-4ebd-8f99-3ad44996d311', tag: 'Antenantal Ward' },
+          { uuid: '7680b7ee-6880-450c-8b7e-2a748b6f9dc7', tag: 'Labour & Delivery Ward' },
+        ],
+      },
+      {
+        uuid: '496c7cc3-0eea-4e84-a04c-2292949e2f7f',
+        label: 'Delivery form',
+        tags: [{ uuid: '7680b7ee-6880-450c-8b7e-2a748b6f9dc7', tag: 'Labour & Delivery Ward' }],
+      },
+      {
+        uuid: '07dc609f-e607-43d6-9dc3-8bd405c4226a',
+        label: 'Post Delivery form',
+        tags: [{ uuid: '473001b4-5a6e-4e2e-b39c-f54edea89c6f', tag: 'Postnatal Ward' }], // Postnatal and Maternity tags
       },
     ],
   },
@@ -474,7 +501,12 @@ export interface WardConfigObject {
   clinicalConsultationEncounterType: string;
   doctorsNoteEncounterType: string;
   admissionRequestFormUuid: string;
-  inPatientForms: Array<{ label: string; uuid: string; hideExpression: string }>;
+  inPatientForms: Array<{
+    label: string;
+    uuid: string;
+    hideExpression: string;
+    tags: Array<{ uuid: string; tag: string }>;
+  }>;
   inPatientVisitTypeUuid: string;
 }
 

package/src/in-patient/in-patient.resource.tsx

@@ -1,7 +1,7 @@
-import { type Encounter, openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
+import { type Encounter, type FetchResponse, openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import type { InpatientRequest as AdmissionRequest } from '../types';
 import type { WardConfigObject } from '../config-schema';
+import type { InpatientRequest as AdmissionRequest } from '../types';
 
 export const usePatientEncounters = (patientUuid: string) => {
   const { inPatientForms } = useConfig<WardConfigObject>();
@@ -54,3 +54,20 @@ export const useAdmissionRequest = (patientUuid: string) => {
     mutate: mutate,
   };
 };
+
+type Tag = { uuid: string; display: string; name: string; description: string };
+
+export const useAdmissionLocationTags = (locationUuid?: string) => {
+  const rep = 'custom:(tags:(uuid,display,name,description))';
+  const url = `${restBaseUrl}/location/${locationUuid}?v=${rep}`;
+  const { data, error, isLoading, mutate } = useSWR<FetchResponse<{ tags: Array<Tag> }>>(
+    locationUuid ? url : null,
+    openmrsFetch,
+  );
+  return {
+    tags: data?.data?.tags ?? [],
+    isLoading,
+    error,
+    mutate,
+  };
+};

package/src/in-patient/inpatient-forms.component.tsx

@@ -11,6 +11,7 @@ import {
 import { launchStartVisitPrompt } from '@openmrs/esm-patient-common-lib';
 import dayjs from 'dayjs';
 import { type WardConfigObject } from '../config-schema';
+import { useAdmissionLocationTags } from './in-patient.resource';
 type InpatientFormsProps = {
   patientUuid: string;
   patient: fhir.Patient;
@@ -18,21 +19,37 @@ type InpatientFormsProps = {
 };
 const InpatientForms: FC<InpatientFormsProps> = ({ patientUuid, patient, emrConfiguration }) => {
   const { t } = useTranslation();
-  const { inPatientForms } = useConfig<WardConfigObject>();
   const { currentVisit } = useVisit(patientUuid);
-  const filteredForms = inPatientForms.filter((form) => {
-    if (!form.hideExpression) {
-      return true;
-    }
-    const age = dayjs().diff(dayjs(patient.birthDate), 'year');
-    const ageInDays = dayjs().diff(dayjs(patient.birthDate), 'day');
-    const ageInMonths = dayjs().diff(dayjs(patient.birthDate), 'month');
-    const gender = patient.gender;
-    const hide = form.hideExpression
-      ? evaluateAsBoolean(form.hideExpression, { age, gender, ageInDays, ageInMonths })
-      : false;
-    return hide;
-  });
+  const admissionLocation = useMemo(
+    () =>
+      currentVisit?.encounters?.find((en) => en.encounterType?.uuid === emrConfiguration?.admissionEncounterType?.uuid)
+        ?.location,
+    [currentVisit?.encounters, emrConfiguration?.admissionEncounterType?.uuid],
+  );
+  const { error: tagsError, isLoading: isloadingTags, tags } = useAdmissionLocationTags(admissionLocation?.uuid);
+
+  const { inPatientForms } = useConfig<WardConfigObject>();
+  const filteredForms = useMemo(
+    () =>
+      inPatientForms.filter((form) => {
+        const age = dayjs().diff(dayjs(patient.birthDate), 'year');
+        const ageInDays = dayjs().diff(dayjs(patient.birthDate), 'day');
+        const ageInMonths = dayjs().diff(dayjs(patient.birthDate), 'month');
+        const gender = patient.gender;
+
+        const shouldHideBasedOnExpression = form.hideExpression
+          ? evaluateAsBoolean(form.hideExpression, { age, gender, ageInDays, ageInMonths })
+          : false;
+
+        const shouldHideBasedOnTags = form.tags?.length
+          ? !form.tags.some((tag) => tags.some((t) => t.uuid === tag.uuid))
+          : false;
+
+        // Keep the form if it should NOT be hidden by either condition
+        return !shouldHideBasedOnExpression && !shouldHideBasedOnTags;
+      }),
+    [inPatientForms, patient.birthDate, patient.gender, tags],
+  );
 
   const isPatientAdmitted = useMemo(() => {
     const hasAdmissionEncounter = currentVisit.encounters.some(
@@ -63,6 +80,8 @@ const InpatientForms: FC<InpatientFormsProps> = ({ patientUuid, patient, emrConf
   if (!isPatientAdmitted) {
     return null;
   }
+
+  if (isloadingTags) return null;
   return (
     <ComboButton size="sm" label={t('inPatientForms', 'In-Patient Forms')}>
       {filteredForms.map((form) => (