@pih/esm-commons-app 2.1.1-pre.112 → 2.1.1-pre.119

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","pages":[{"component":"root","route":"appointments"},{"component":"root","route":"service-queues"},{"component":"root","route":"dispensing2"},{"component":"root","route":"ward"}],"extensions":[{"name":"o2-pregnancy-infant-dashboard","component":"o2PregnancyInfantDashboard","slot":"ward-patient-workspace-content-slot"},{"name":"triage-waiting-queue-actions","component":"triageWaitingQueueActions","slot":"queue-table-triage-waiting-queue-actions-slot"}],"workspaces2":[{"name":"o2-visit-summary-workspace","component":"o2VisitSummaryWorkspace","window":"o2-visit-summary-window"},{"name":"o2-vital-signs-workspace","component":"o2VitalSignsWorkspace","window":"o2-vital-signs-window"},{"name":"maternal-triage-form-workspace","component":"maternalTriageFormWorkspace","window":"maternal-triage-form-window"}],"workspaceWindows2":[{"name":"o2-visit-summary-window","icon":"o2VisitSummaryWorkspaceSideRailIcon","group":"ward-patient","width":"extra-wide","canMaximize":true},{"name":"o2-vital-signs-window","icon":"o2VitalSignsWorkspaceSideRailIcon","group":"ward-patient","width":"extra-wide","canMaximize":true},{"name":"maternal-triage-form-window","group":"service-queues","width":"extra-wide","canMaximize":true}],"version":"2.1.1-pre.112"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","pages":[{"component":"root","route":"appointments"},{"component":"root","route":"service-queues"},{"component":"root","route":"dispensing2"},{"component":"root","route":"ward"}],"extensions":[{"name":"o2-pregnancy-infant-dashboard","component":"o2PregnancyInfantDashboard","slot":"ward-patient-workspace-content-slot"},{"name":"triage-waiting-queue-actions","component":"triageWaitingQueueActions","slot":"queue-table-triage-waiting-queue-actions-slot"}],"workspaces2":[{"name":"o2-visit-summary-workspace","component":"o2VisitSummaryWorkspace","window":"o2-visit-summary-window"},{"name":"o2-vital-signs-workspace","component":"o2VitalSignsWorkspace","window":"o2-vital-signs-window"},{"name":"maternal-triage-form-workspace","component":"maternalTriageFormWorkspace","window":"maternal-triage-form-window"}],"workspaceWindows2":[{"name":"o2-visit-summary-window","icon":"o2VisitSummaryWorkspaceSideRailIcon","group":"ward-patient","width":"extra-wide","canMaximize":true},{"name":"o2-vital-signs-window","icon":"o2VitalSignsWorkspaceSideRailIcon","group":"ward-patient","width":"extra-wide","canMaximize":true},{"name":"maternal-triage-form-window","group":"service-queues","width":"extra-wide","canMaximize":true}],"version":"2.1.1-pre.119"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pih/esm-commons-app",
-  "version": "2.1.1-pre.112",
+  "version": "2.1.1-pre.119",
   "description": "An app to define extensions to be slotted into other apps that are not PIH specific.",
   "browser": "dist/pih-esm-commons-app.js",
   "main": "src/index.ts",

package/src/config-schema.ts

@@ -21,6 +21,11 @@ export const configSchema = {
       _default: '1440AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
       _description: 'UUID for the Fetal heart rate concept',
     },
+    secondFhrUuid: {
+      _type: Type.ConceptUuid,
+      _default: 'fee3bcb1-209e-4eb2-9204-fbf7ca4a05d1',
+      _description: 'UUID for the Heart beat of 2nd fetus concept',
+    },
   },
 };
 

package/src/ward-app/VitalsTable.tsx

@@ -11,7 +11,7 @@ import {
   TableRow,
   Button,
 } from '@carbon/react';
-import { restBaseUrl, useConfig, useOpenmrsFetchAll, usePagination } from '@openmrs/esm-framework';
+import { restBaseUrl, useConfig, useOpenmrsFetchAll, usePagination, usePatient } from '@openmrs/esm-framework';
 import { Pagination, NumericObservation } from '@openmrs/esm-styleguide';
 import {
   useConceptReferenceRanges,
@@ -64,7 +64,7 @@ const VitalsTable: React.FC<VitalsTableProps> = ({ patientUuid, visitUuid }) =>
     externalModuleName: '@openmrs/esm-patient-vitals-app',
   });
   const { concepts: localConcepts } = useConfig<{
-    concepts: { hemoglobinUuid: string; glucoseUuid: string; fhrUuid: string };
+    concepts: { hemoglobinUuid: string; glucoseUuid: string; fhrUuid: string; secondFhrUuid: string };
   }>();
   const vitalsConcepts = {
     systolic: externalConcepts.systolicBloodPressureUuid,
@@ -76,10 +76,20 @@ const VitalsTable: React.FC<VitalsTableProps> = ({ patientUuid, visitUuid }) =>
     hemoglobin: localConcepts.hemoglobinUuid,
     glucose: localConcepts.glucoseUuid,
     fhr: localConcepts.fhrUuid,
+    secondFhr: localConcepts.secondFhrUuid,
   };
   const { referenceRangeMap } = useConceptReferenceRanges(patientUuid, Object.values(vitalsConcepts));
   const { t } = useTranslation();
   const [showAll, setShowAll] = useState(false);
+  const { patient } = usePatient(patientUuid);
+
+  // Check if patient is less than 30 days old
+  const isNewborn = useMemo(() => {
+    if (!patient?.birthDate) return false;
+    const birthDate = dayjs(patient.birthDate);
+    const ageInDays = dayjs().diff(birthDate, 'day');
+    return ageInDays < 30;
+  }, [patient?.birthDate]);
 
   const interpretationLabels: Record<ObservationInterpretation, string> = {
     normal: t('normal', 'Normal'),
@@ -108,6 +118,7 @@ const VitalsTable: React.FC<VitalsTableProps> = ({ patientUuid, visitUuid }) =>
     hemoglobin?: VitalCellData;
     glucose?: VitalCellData;
     fhr?: VitalCellData;
+    secondFhr?: VitalCellData;
     provider?: string;
   }
 
@@ -130,16 +141,27 @@ const VitalsTable: React.FC<VitalsTableProps> = ({ patientUuid, visitUuid }) =>
     };
   };
 
-  const vitalColumns: Array<{ key: VitalColumnKey; label: string; conceptUuid?: string }> = [
-    { key: 'bp', label: t('bloodPressure', 'BP') },
-    { key: 'pulse', label: t('pulse', 'HR'), conceptUuid: vitalsConcepts.pulse },
-    { key: 'temperature', label: t('temperature', 'Temp'), conceptUuid: vitalsConcepts.temperature },
-    { key: 'respiratoryRate', label: t('respiratoryRate', 'RR'), conceptUuid: vitalsConcepts.respiratoryRate },
-    { key: 'oxygenSaturation', label: t('oxygenSaturation', 'O2 Sat'), conceptUuid: vitalsConcepts.oxygenSaturation },
-    { key: 'hemoglobin', label: t('hemoglobin', 'Hb'), conceptUuid: vitalsConcepts.hemoglobin },
-    { key: 'glucose', label: t('glucose', 'Glucose'), conceptUuid: vitalsConcepts.glucose },
-    { key: 'fhr', label: t('fetalHeartRate', 'FHR'), conceptUuid: vitalsConcepts.fhr },
-  ];
+  const vitalColumns: Array<{ key: VitalColumnKey; label: string; conceptUuid?: string }> = useMemo(() => {
+    let columns = [
+      { key: 'bp', label: t('bloodPressure', 'BP') },
+      { key: 'pulse', label: t('pulse', 'HR'), conceptUuid: vitalsConcepts.pulse },
+      { key: 'temperature', label: t('temperature', 'Temp'), conceptUuid: vitalsConcepts.temperature },
+      { key: 'respiratoryRate', label: t('respiratoryRate', 'RR'), conceptUuid: vitalsConcepts.respiratoryRate },
+      { key: 'oxygenSaturation', label: t('oxygenSaturation', 'O2 Sat'), conceptUuid: vitalsConcepts.oxygenSaturation },
+      { key: 'glucose', label: t('glucose', 'Glucose'), conceptUuid: vitalsConcepts.glucose },
+    ] as Array<{ key: VitalColumnKey; label: string; conceptUuid?: string }>;
+
+    // Only include hemoglobin, fhr, and secondFhr for patients 30 days or older
+    if (!isNewborn) {
+      columns.push(
+        { key: 'hemoglobin', label: t('hemoglobin', 'Hb'), conceptUuid: vitalsConcepts.hemoglobin },
+        { key: 'fhr', label: t('fetalHeartRate', 'FHR'), conceptUuid: vitalsConcepts.fhr },
+        { key: 'secondFhr', label: t('secondFetalHeartRate', '2nd FHR'), conceptUuid: vitalsConcepts.secondFhr },
+      );
+    }
+
+    return columns;
+  }, [isNewborn, vitalsConcepts, t]);
 
   const renderVitalCell = (
     cellData: VitalCellData | { systolic?: VitalCellData; diastolic?: VitalCellData } | undefined,
@@ -216,19 +238,20 @@ const VitalsTable: React.FC<VitalsTableProps> = ({ patientUuid, visitUuid }) =>
       id: encounter.uuid,
       date: dayjs(encounter.encounterDatetime).format('DD/MM/YYYY HH:mm'),
       bp: {
-        systolic: createVitalCellData(vitalsMap[vitalsConcepts.systolic], vitalsConcepts.systolic),
-        diastolic: createVitalCellData(vitalsMap[vitalsConcepts.diastolic], vitalsConcepts.diastolic),
+        systolic: createVitalCellData(vitalsMap[vitalsConcepts.systolic]),
+        diastolic: createVitalCellData(vitalsMap[vitalsConcepts.diastolic]),
       },
-      pulse: createVitalCellData(vitalsMap[vitalsConcepts.pulse], vitalsConcepts.pulse),
-      temperature: createVitalCellData(vitalsMap[vitalsConcepts.temperature], vitalsConcepts.temperature),
+      pulse: createVitalCellData(vitalsMap[vitalsConcepts.pulse]),
+      temperature: createVitalCellData(vitalsMap[vitalsConcepts.temperature]),
       oxygenSaturation: createVitalCellData(
         vitalsMap[vitalsConcepts.oxygenSaturation],
         vitalsConcepts.oxygenSaturation,
       ),
-      respiratoryRate: createVitalCellData(vitalsMap[vitalsConcepts.respiratoryRate], vitalsConcepts.respiratoryRate),
-      hemoglobin: createVitalCellData(vitalsMap[vitalsConcepts.hemoglobin], vitalsConcepts.hemoglobin),
-      glucose: createVitalCellData(vitalsMap[vitalsConcepts.glucose], vitalsConcepts.glucose),
-      fhr: createVitalCellData(vitalsMap[vitalsConcepts.fhr], vitalsConcepts.fhr),
+      respiratoryRate: createVitalCellData(vitalsMap[vitalsConcepts.respiratoryRate]),
+      hemoglobin: createVitalCellData(vitalsMap[vitalsConcepts.hemoglobin]),
+      glucose: createVitalCellData(vitalsMap[vitalsConcepts.glucose]),
+      fhr: createVitalCellData(vitalsMap[vitalsConcepts.fhr]),
+      secondFhr: createVitalCellData(vitalsMap[vitalsConcepts.secondFhr]),
       provider: providerName,
     };
   };