@kenyaemr/esm-ward-app 8.5.1-pre.52 → 8.5.1-pre.61

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"}],"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.52"}
+{"$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.61"}

package/package.json

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

package/src/config-schema.ts

@@ -284,6 +284,11 @@ export const configSchema: ConfigSchema = {
     _type: Type.String,
     _default: '98a781d2-b777-4756-b4c9-c9b0deb3483c',
   },
+  admissionRequestFormUuid: {
+    _description: 'Admission request form uuid',
+    _type: Type.String,
+    _default: 'c3496cb0-ab42-4d42-9ec7-d09b9f209c85',
+  },
   conceptUuidForWardAdmission: {
     _description: 'Concept UUID for ward admission',
     _type: Type.Object,
@@ -370,6 +375,54 @@ export const configSchema: ConfigSchema = {
     _type: Type.UUID,
     _default: '14b36860-5033-4765-b91b-ace856ab64c2',
   },
+  inPatientForms: {
+    _type: Type.Array,
+    _description: 'List of forms that can be filled out for in-patients',
+    _default: [
+      {
+        label: 'Cardex Nursing Plan',
+        uuid: '1f81d5e2-3569-40cf-bbb9-361a53ba409b',
+      },
+      {
+        label: 'IPD Procedure Form',
+        uuid: '2b9c2b94-0b03-416a-b312-eef49b42f72c',
+      },
+      {
+        label: 'Newborn Unit Admission ',
+        uuid: '5b0a08f5-87c1-40cc-8c09-09c33b44523d',
+        hideExpression: 'ageInDays < 28',
+      },
+      {
+        label: 'Partograph Form',
+        uuid: '3791e5b7-2cdc-44fc-982b-a81135367c96',
+        hideExpression: 'age >= 10 && gender === "female"',
+      },
+      {
+        uuid: '87379b0a-738b-4799-9736-cdac614cee2a',
+        label: 'Doctors Note',
+      },
+      {
+        uuid: '43dacebf-2412-44b6-b55a-63aff5b02fcd',
+        label: 'Post Delivery',
+      },
+      {
+        uuid: 'ac043326-c5f0-4d11-9e6f-f7266b3f3859',
+        label: 'Post Operation',
+      },
+      {
+        uuid: 'a14824ca-29af-4d37-b9da-6bdee39f8808',
+        label: 'Pre-Operation Checklist',
+      },
+      {
+        uuid: 'b4bfa7a3-f6ed-4339-a4ec-b076463c0696',
+        label: 'Fluid Intake',
+      },
+      {
+        uuid: 'cd65f1dd-0047-4449-9c38-0710a7214c52',
+        label: 'Initial Nursing Cardex',
+      },
+    ],
+  },
 };
 
 export interface WardConfigObject {
@@ -415,6 +468,8 @@ export interface WardConfigObject {
   drugOrderEncounterType: string;
   clinicalConsultationEncounterType: string;
   doctorsNoteEncounterType: string;
+  admissionRequestFormUuid: string;
+  inPatientForms: Array<{ label: string; uuid: string; hideExpression: string }>;
 }
 
 export interface PendingItemsElementConfig {

package/src/hooks/useSummaryMetrics.ts

@@ -34,7 +34,7 @@ export const useWardsSummaryMetrics = () => {
   }, [filteredData]);
 
   const bedOccupancy = useMemo(() => {
-    if (!totalBeds || !occupiedBeds) return `0%`;
+    if (!totalBeds) return `0%`;
     return `${((occupiedBeds / totalBeds) * 100).toFixed(2)}%`;
   }, [totalBeds, occupiedBeds]);
 

package/src/in-patient/admission-request.component.tsx

@@ -0,0 +1,114 @@
+import {
+  Button,
+  DataTable,
+  DataTableSkeleton,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@carbon/react';
+import { formatDatetime, isDesktop, launchWorkspace, useConfig, useLayoutType } from '@openmrs/esm-framework';
+import { CardHeader, EmptyState, ErrorState } from '@openmrs/esm-patient-common-lib';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Add } from '@carbon/react/icons';
+import type { WardConfigObject } from '../config-schema';
+import { useAdmissionRequest } from './in-patient.resource';
+
+type AdmissionRequestProps = {
+  patientUuid: string;
+};
+
+const AdmissionRequest: React.FC<AdmissionRequestProps> = ({ patientUuid }) => {
+  const { t } = useTranslation();
+  const layout = useLayoutType();
+  const controlSize = isDesktop(layout) ? 'sm' : 'md';
+  const { admissionRequestFormUuid } = useConfig<WardConfigObject>();
+  const { admissionRequest, isLoading, error, mutate } = useAdmissionRequest(patientUuid);
+  const rows = useMemo(() => {
+    return admissionRequest.map((admissionRequest) => ({
+      id: admissionRequest.patient.uuid,
+      admissionLocation: admissionRequest.dispositionLocation?.display,
+      admissionType: admissionRequest.dispositionType,
+      disposition: admissionRequest.disposition.display,
+      requestDatetime: formatDatetime(new Date(admissionRequest.dispositionEncounter.encounterDatetime), {
+        mode: 'standard',
+      }),
+    }));
+  }, [admissionRequest]);
+
+  const headers = useMemo(() => {
+    return [
+      { key: 'requestDatetime', header: t('requestDatetime', 'Request Datetime') },
+      { key: 'admissionLocation', header: t('admissionLocation', 'Admission Location') },
+      { key: 'admissionType', header: t('admissionType', 'Admission Type') },
+      { key: 'disposition', header: t('disposition', 'Disposition') },
+    ];
+  }, [t]);
+
+  const handleLaunchAdmissionRequestForm = () => {
+    launchWorkspace('patient-form-entry-workspace', {
+      workspaceTitle: 'Admission Request',
+      mutateForm: mutate,
+      formInfo: {
+        formUuid: admissionRequestFormUuid,
+        encounterUuid: '',
+      },
+    });
+  };
+
+  if (isLoading) {
+    return <DataTableSkeleton />;
+  }
+
+  if (error) {
+    return <ErrorState error={error} headerTitle={t('admissionRequest', 'Admission Request')} />;
+  }
+
+  if (admissionRequest.length === 0) {
+    return (
+      <EmptyState
+        displayText={t('admissionRequests', 'admission requests')}
+        headerTitle={t('admissionRequest', 'Admission Request')}
+        launchForm={handleLaunchAdmissionRequestForm}
+      />
+    );
+  }
+
+  return (
+    <div>
+      <CardHeader title={t('admissionRequest', 'Admission Request')}>
+        <Button renderIcon={Add} onClick={handleLaunchAdmissionRequestForm} kind="ghost">
+          {t('add', 'Add')}
+        </Button>
+      </CardHeader>
+      <DataTable size={controlSize} rows={rows} headers={headers}>
+        {({ rows, headers, getTableProps, getHeaderProps, getRowProps, getCellProps }) => (
+          <Table {...getTableProps()}>
+            <TableHead>
+              <TableRow>
+                {headers.map((header) => (
+                  <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
+                ))}
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {rows.map((row) => (
+                <TableRow {...getRowProps({ row })}>
+                  {row.cells.map((cell) => (
+                    <TableCell {...getCellProps({ cell })}>{cell.value}</TableCell>
+                  ))}
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        )}
+      </DataTable>
+    </div>
+  );
+};
+
+export default AdmissionRequest;