@kenyaemr/esm-morgue-app 5.3.10-pre.1696 → 5.3.10-pre.1703

package/src/card/avail-compartment.compartment.tsx

@@ -16,13 +16,10 @@ interface AvailableCompartmentProps {
 }
 
 const AvailableCompartment: React.FC<AvailableCompartmentProps> = ({ patientInfo, index }) => {
+  const patientUuid = patientInfo?.patient?.uuid;
   const { t } = useTranslation();
-  const { isLoading, error, person } = usePerson(patientInfo.uuid);
-  const {
-    data: activeDeceased,
-    error: isActiveError,
-    isLoading: isActiveLoading,
-  } = useActiveMorgueVisit(patientInfo?.uuid);
+  const { isLoading, error, person } = usePerson(patientInfo?.person?.uuid);
+  const { data: activeDeceased, error: isActiveError, isLoading: isActiveLoading } = useActiveMorgueVisit(patientUuid);
 
   const startVisitDate = activeDeceased?.[0]?.startDatetime;
 
@@ -72,7 +69,7 @@ const AvailableCompartment: React.FC<AvailableCompartmentProps> = ({ patientInfo
         <span className={styles.viewDetails}>
           <ConfigurableLink
             className={styles.viewDetailsLink}
-            to={`\${openmrsSpaBase}/patient/${patientInfo.uuid}/chart/deceased-panel`}>
+            to={`\${openmrsSpaBase}/patient/${patientUuid}/chart/deceased-panel`}>
             <View size={20} />
           </ConfigurableLink>
         </span>

package/src/config-schema.ts

@@ -21,7 +21,7 @@ export const configSchema = {
   morgueDepartmentServiceTypeUuid: {
     _type: Type.String,
     _description: ' UUID for morgue department service type',
-    _default: 'd7bd4cc0-90b1-4f22-90f2-ab7fde936727',
+    _default: '030bb7ab-9aea-454a-aa17-96abf17727c7',
   },
   insurancepaymentModeUuid: {
     _type: Type.String,
@@ -71,7 +71,7 @@ export const configSchema = {
   policeIDNumber: {
     _type: Type.String,
     _description: 'UUID for police id number concept',
-    _default: '8d488d02-d1d8-41a5-8219-61f4fc5dbeb0',
+    _default: '163084AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
   },
   encounterProviderRoleUuid: {
     _type: Type.UUID,
@@ -81,7 +81,7 @@ export const configSchema = {
   dischargeAreaUuid: {
     _type: Type.String,
     _description: 'UUID for discharge area concept',
-    _default: '89ebccf1-4cca-4195-aeff-3e75fdf976b4',
+    _default: '734f9526-84db-4002-9d98-58da580e501f',
   },
   adminUuid: {
     _type: Type.String,

package/src/hook/useMorgue.resource.ts

@@ -84,12 +84,17 @@ export const useDeceasedPatient = (searchTerm?: string) => {
         try {
           setIsLoadingStatus(true);
           const status = await Promise.all(
-            paginatedData?.map((data) => {
-              return getMorguePatientStatus(data?.uuid, morgueVisitTypeUuid, morgueDischargeEncounterTypeUuid);
-            }),
+            paginatedData.map((data) =>
+              getMorguePatientStatus(data.person?.uuid, morgueVisitTypeUuid, morgueDischargeEncounterTypeUuid),
+            ),
           );
 
-          setDeceasedPatient(paginatedData?.map((patient, index) => ({ ...patient, status: status[index] })));
+          setDeceasedPatient(
+            paginatedData.map((patient, index) => ({
+              ...patient,
+              status: status[index],
+            })),
+          );
         } catch (error) {
           setStatusError(error);
         } finally {

package/src/tables/discharge-queue.component.tsx

@@ -51,23 +51,31 @@ export const DischargedBodies: React.FC<DischargedProps> = ({ isLoading, decease
 
   const dischargedDeceased = deceasedPatients?.filter((patient) => patient?.status === 'discharged') || [];
 
-  const rows = dischargedDeceased.map((patient) => ({
-    id: patient.uuid,
-    name: (
-      <ConfigurableLink
-        style={{ textDecoration: 'none', maxWidth: '50%' }}
-        to={patientChartUrl}
-        templateParams={{ patientUuid: patient?.person?.uuid }}>
-        {patient.person.display?.toUpperCase()}
-      </ConfigurableLink>
-    ),
-    gender: patient.person.gender,
-    age: patient?.person?.age,
-    identifier: patient?.identifiers[0]?.identifier,
-    deathDate: new Date(patient.person.deathDate).toLocaleString(),
-    causeOfDeath: patient.person.causeOfDeath?.display,
-    status: <Tag type="magenta">{patient.status}</Tag>,
-  }));
+  const rows = dischargedDeceased.map((patient, index) => {
+    const openMrsId =
+      patient?.patient?.identifiers
+        ?.find((id) => id.display.startsWith('OpenMRS ID'))
+        ?.display.split('=')[1]
+        ?.trim() || '--';
+
+    return {
+      id: `${patient?.patient?.uuid}`,
+      name: (
+        <ConfigurableLink
+          style={{ textDecoration: 'none', maxWidth: '50%' }}
+          to={patientChartUrl}
+          templateParams={{ patientUuid: patient?.person?.uuid }}>
+          {patient?.person?.person?.display?.toUpperCase()}
+        </ConfigurableLink>
+      ),
+      gender: patient?.person?.person?.gender || '--',
+      age: patient?.person?.person?.age || '--',
+      identifier: openMrsId,
+      deathDate: formatDateTime(patient?.person?.person?.deathDate) || '--',
+      causeOfDeath: patient?.person?.person?.causeOfDeath?.display || '--',
+      status: <Tag type="magenta">{patient?.status || '--'}</Tag>,
+    };
+  });
 
   return <GenericTable rows={rows} headers={genericTableHeader} title={dischargedInLine} />;
 };

package/src/tables/waiting-queue.component.tsx

@@ -50,16 +50,24 @@ export const WaitingQueue: React.FC<WaitingQueueProps> = ({ isLoading, deceasedP
 
   const awaitingPatients = deceasedPatients?.filter((patient) => patient?.status === 'awaiting') || [];
 
-  const rows = awaitingPatients.map((patient) => ({
-    id: patient.uuid,
-    name: patient.person.display?.toUpperCase(),
-    gender: patient.person.gender,
-    age: patient?.person?.age,
-    identifier: patient?.identifiers[0]?.identifier,
-    deathDate: patient.person.deathDate ? new Date(patient.person.deathDate).toLocaleString() : t('nullDate', '--'),
-    causeOfDeath: patient.person.causeOfDeath?.display,
-    status: <Tag type="magenta">{patient.status}</Tag>,
-  }));
+  const rows = awaitingPatients.map((patient, index) => {
+    const openMrsId =
+      patient?.patient?.identifiers
+        ?.find((id) => id.display.startsWith('OpenMRS ID'))
+        ?.display.split('=')[1]
+        ?.trim() || t('missingIdentifier', '--');
+
+    return {
+      id: `${patient?.patient?.uuid}`,
+      name: toUpperCase(patient?.person?.person?.display || '--'),
+      gender: patient?.person?.person?.gender || '--',
+      age: patient?.person?.person?.age || '--',
+      identifier: openMrsId,
+      deathDate: formatDateTime(patient?.person?.person?.deathDate) || '--',
+      causeOfDeath: patient?.person?.person?.causeOfDeath?.display || '--',
+      status: <Tag type="magenta">{patient?.status || '--'}</Tag>,
+    };
+  });
 
   const handleAdmissionForm = (patientUuid: string) => {
     launchWorkspace('patient-additional-info-form', {
@@ -68,11 +76,16 @@ export const WaitingQueue: React.FC<WaitingQueueProps> = ({ isLoading, deceasedP
     });
   };
 
-  const actionColumn = (row) => (
-    <OverflowMenu size="sm" flipped>
-      <OverflowMenuItem itemText={t('admit', 'Admit')} onClick={() => handleAdmissionForm(row.id)} />
-    </OverflowMenu>
-  );
+  const actionColumn = (row) => {
+    return (
+      <OverflowMenu size="sm" flipped>
+        <OverflowMenuItem
+          itemText={t('admitToMorgue', 'Admit to morgue')}
+          onClick={() => handleAdmissionForm(row.id)}
+        />
+      </OverflowMenu>
+    );
+  };
 
   return <GenericTable rows={rows} headers={genericTableHeader} actionColumn={actionColumn} title={waitingInLine} />;
 };

package/src/types/index.ts

@@ -41,6 +41,10 @@ export interface DeceasedInfo {
   uuid: string;
   status?: string;
   display: string;
+  patient: {
+    uuid: string;
+    display: string;
+  };
   identifiers: Array<{
     identifier: string;
     uuid: string;

package/translations/en.json

@@ -1,7 +1,7 @@
 {
   "admissionForm": "Admission form",
-  "admit": "Admit",
-  "admitted": "Admitted Bodies",
+  "admitted": "Admitted",
+  "admitToMorgue": "Admit to morgue",
   "allocation": "Allocation",
   "allocations": "Allocation",
   "causeOfDeath": "Cause of death: ",
@@ -9,13 +9,13 @@
   "discharged": "Discharged",
   "empty": "Empty",
   "errorMessage": "Error",
+  "missingIdentifier": "--",
   "mortuary": "Mortuary",
   "mortuaryManagement": "Mortuary management",
   "noAdmittedBodies": "There are no admitted bodies",
   "noDeceasedPersons": "There are no deceased persons on the waiting list",
   "noResultFound": "Sorry, no results found",
   "noWaitingList": "Waiting List",
-  "nullDate": "--",
   "pullingCompartment": "Pulling compartments data.....",
   "searchForADeceased": "Try to search again using the deceased patient's unique ID number",
   "waitingInLine": "Waiting In Line",