@ampath/esm-reports-app 1.0.0-next.8 → 1.0.0-next.80

package/src/reports/moh-706/sub-reports/blood-chemistry/blood-chemistry.component.tsx

@@ -1,311 +1,235 @@
-import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/react';
-import TableWrapper from "../../../table-wrapper/table-wrapper.component";
+import React, { useMemo } from 'react';
+import TableWrapper from '../../../table-wrapper/table-wrapper.component';
 import styles from '../../../table-wrapper/table-wrapper.scss';
-import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
-import { getCell } from "../../../../utils/utils";
+import TableRowMapper from '../../../table-wrapper/table-row-mapper.component';
+import { getCell } from '../../../../utils/utils';
 
-const BloodChemistry: React.FC = () => {
-    const tableRows = useMemo(() => {
-        return [
-            {
-                tableCells: [
-                    getCell("", "2. BLOOD CHEMISTRY", 4, 1, true),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "", 4),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "Blood Sugar Test", 1, 1, true),
-                    getCell("", "Total Exam", 1, 1, true),
-                    getCell("", "Low", 1, 1, true),
-                    getCell("", "High", 1, 1, true),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.1 Blood sugar"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.2 OGTT"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.3 Renal Function Test", 1, 1, true),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.4 Creatinine"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "1.4 Proteins"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.5 Urea"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.6 Sodium"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.7 Potassium"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.8 Chlorides"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.8 Liver Function Test", 1, 1, true),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.9 Direct bilirubin"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.10 Total bilirubin"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.11 ASAT (SGOT)"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.12 ALAT (SGPT)"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.13 Serum Protein"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.14 Albumin"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.15 Alkaline Phosphatase"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.16 Lipid Profile", 1, 1, true),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.17 Total cholesterol"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.18 Triglycerides"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.19 LDL"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "Hormonal Test", 1, 1, true),
-                    getCell("", "Total Exam", 1, 1, true),
-                    getCell("", "Low", 1, 1, true),
-                    getCell("", "High", 1, 1, true),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.20 T3"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.21 T4"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.22 TSH"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "Tumor Markers", 1, 1, true),
-                    getCell("", "Total Exam", 1, 1, true),
-                    getCell("", "Number Positive", 2, 1, true),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.23 PSA"),
-                    getCell(),
-                    getCell("", "", 2),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.24 CA 15-3"),
-                    getCell(),
-                    getCell("", "", 2),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.25 CA 19-9"),
-                    getCell(),
-                    getCell("", "", 2),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.26 CA 125"),
-                    getCell(),
-                    getCell("", "", 2),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.27 CEA"),
-                    getCell(),
-                    getCell("", "", 2),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.28 AFP"),
-                    getCell(),
-                    getCell("", "", 2),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "CSF Chemistry", 1, 1, true),
-                    getCell("", "Total Exam", 1, 1, true),
-                    getCell("", "Low", 1, 1, true),
-                    getCell("", "High", 1, 1, true),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.29 Proteins"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-            {
-                tableCells: [
-                    getCell("", "2.30 Glucose"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
-                ]
-            },
-        ]
-    }, []);
+interface BloodChemistryProps {
+  data?: any;
+  locationUuids?: string;
+  startDate?: string;
+  endDate?: string;
+}
+
+const BloodChemistry: React.FC<BloodChemistryProps> = ({ data, locationUuids, startDate, endDate }) => {
+  const tableRows = useMemo(() => {
+    return [
+      {
+        tableCells: [getCell('', '2. BLOOD CHEMISTRY', 4, 1, true)],
+      },
+      {
+        tableCells: [getCell('', '', 4)],
+      },
+      {
+        tableCells: [
+          getCell('', 'Blood Sugar Test', 1, 1, true),
+          getCell('', 'Total Exam', 1, 1, true),
+          getCell('', 'Low', 1, 1, true),
+          getCell('', 'High', 1, 1, true),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.1 Blood sugar'),
+          getCell('total_blood_sugar'),
+          getCell('blood_sugar_low'),
+          getCell('blood_sugar_high'),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.2 OGTT'), getCell('total_ogtt'), getCell('ogtt_low'), getCell('ogtt_high')],
+      },
+      {
+        tableCells: [getCell('', '2.3 Renal Function Test', 1, 1, true), getCell('total_renal_function_test'), getCell(), getCell()],
+      },
+      {
+        tableCells: [
+          getCell('', '2.4 Creatinine'),
+          getCell('total_creatinine'),
+          getCell('creatinine_low'),
+          getCell('creatinine_high'),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.5 Urea'), getCell('total_urea'), getCell('urea_low'), getCell('urea_high')],
+      },
 
+      {
+        tableCells: [getCell('', '2.6 Sodium'), getCell('total_sodium'), getCell('sodium_low'), getCell('sodium_high')],
+      },
+      {
+        tableCells: [
+          getCell('', '2.7 Potassium'),
+          getCell('total_potassium'),
+          getCell('potassium_low'),
+          getCell('potassium_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.8 Chlorides'),
+          getCell('total_chlorides'),
+          getCell('chlorides_low'),
+          getCell('chlorides_high'),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.8 Liver Function Test', 1, 1, true), getCell('total_liver_function_test'), getCell(), getCell()],
+      },
+      {
+        tableCells: [
+          getCell('', '2.9 Direct bilirubin'),
+          getCell('total_direct_bili'),
+          getCell('direct_bili_low'),
+          getCell('direct_bili_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.10 Total bilirubin'),
+          getCell('total_total_bili'),
+          getCell('total_bili_low'),
+          getCell('total_bili_high'),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.11 ASAT (SGOT)'), getCell('total_ast'), getCell('ast_low'), getCell('ast_high')],
+      },
+      {
+        tableCells: [getCell('', '2.12 ALAT (SGPT)'), getCell('total_alt'), getCell('alt_low'), getCell('alt_high')],
+      },
+      {
+        tableCells: [
+          getCell('', '2.13 Serum Protein'),
+          getCell('total_total_protein'),
+          getCell('total_protein_low'),
+          getCell('total_protein_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.14 Albumin'),
+          getCell('total_albumin'),
+          getCell('albumin_low'),
+          getCell('albumin_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.15 Alkaline Phosphatase'),
+          getCell('total_alk_phos'),
+          getCell('alk_phos_low'),
+          getCell('alk_phos_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.16 Lipid Profile', 1, 1, true),
+          getCell('total_lipid_profile'),
+          getCell('lipid_profile_low'),
+          getCell('lipid_profile_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.17 Total cholesterol'),
+          getCell('total_cholesterol_with_members'),
+          getCell('total_cholesterol_low'),
+          getCell('total_cholesterol_high'),
+        ],
+      },
 
-    return <TableWrapper>
-         <TableRowMapper tableRows={tableRows} />
+      {
+        tableCells: [
+          getCell('', '2.18 Triglycerides'),
+          getCell('total_triglycerides_with_members'),
+          getCell('triglycerides_low'),
+          getCell('triglycerides_high'),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.19 LDL'), getCell('total_ldl_with_members'), getCell('ldl_low'), getCell('ldl_high')],
+      },
+      {
+        tableCells: [
+          getCell('', 'Hormonal Test', 1, 1, true),
+          getCell('', 'Total Exam', 1, 1, true),
+          getCell('', 'Low', 1, 1, true),
+          getCell('', 'High', 1, 1, true),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.20 T3'), getCell('total_t3'), getCell('t3_low'), getCell('t3_high')],
+      },
+      {
+        tableCells: [getCell('', '2.21 T4'), getCell('total_t4'), getCell('t4_low'), getCell('t4_high')],
+      },
+      {
+        tableCells: [getCell('', '2.22 TSH'), getCell('total_tsh'), getCell('tsh_low'), getCell('tsh_high')],
+      },
+      {
+        tableCells: [
+          getCell('', 'Tumor Markers', 1, 1, true),
+          getCell('', 'Total Exam', 1, 1, true),
+          getCell('', 'Number Positive', 2, 1, true),
+        ],
+      },
+      {
+        tableCells: [getCell('', '2.23 PSA'), getCell('total_psa'), getCell('positive_psa', '', 2)],
+      },
+      {
+        tableCells: [getCell('', '2.24 CA 15-3'), getCell('total_ca_15_3'), getCell('ca_15_3_high', '', 2)],
+      },
+      {
+        tableCells: [getCell('', '2.25 CA 19-9'), getCell('total_ca_19_9'), getCell('positive_ca_19_9', '', 2)],
+      },
+      {
+        tableCells: [getCell('', '2.26 CA 125'), getCell('total_ca_125'), getCell('ca_125_high', '', 2)],
+      },
+      {
+        tableCells: [getCell('', '2.27 CEA'), getCell('total_cea'), getCell('positive_cea', '', 2)],
+      },
+      {
+        tableCells: [getCell('', '2.28 AFP'), getCell('total_afp'), getCell('positive_afp', '', 2)],
+      },
+      {
+        tableCells: [
+          getCell('', 'CSF Chemistry', 1, 1, true),
+          getCell('', 'Total Exam', 1, 1, true),
+          getCell('', 'Low', 1, 1, true),
+          getCell('', 'High', 1, 1, true),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.29 Proteins'),
+          getCell('total_proteins'),
+          getCell('proteins_low'),
+          getCell('proteins_high'),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', '2.30 Glucose'),
+          getCell('total_glucose'),
+          getCell('glucose_low'),
+          getCell('glucose_high'),
+        ],
+      },
+    ];
+  }, []);
+
+  return (
+    <TableWrapper>
+      <TableRowMapper
+        tableRows={tableRows}
+        data={data}
+        locationUuids={locationUuids}
+        startDate={startDate}
+        endDate={endDate}
+      />
     </TableWrapper>
-}
+  );
+};
 
-export default BloodChemistry;
+export default BloodChemistry;

package/src/reports/moh-706/sub-reports/haematology/haematology.component.tsx

@@ -3,7 +3,14 @@ import TableWrapper from "../../../table-wrapper/table-wrapper.component";
 import { getCell } from "../../../../utils/utils";
 import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
 
-const Haematology: React.FC = () => {
+interface HaematologyProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
+
+const Haematology: React.FC<HaematologyProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
@@ -22,15 +29,15 @@ const Haematology: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "4.1 Full blood count"),
-                    getCell(),
-                    getCell(),
-                    getCell()
+                    getCell("total_fbc"),
+                    getCell("fbc_hb_less_than_5"),
+                    getCell("fbc_hb_5_to_10")
                 ]
             },
             {
                 tableCells: [
                     getCell("", "4.2 HB estimation tests (other techniques)"),
-                    getCell(),
+                    getCell("total_hb_estimation"),
                     getCell(),
                     getCell()
                 ]
@@ -46,9 +53,9 @@ const Haematology: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "Hemoglobin A1c (HbA1c)"),
-                    getCell(),
-                    getCell(),
-                    getCell()
+                    getCell("total_hba1c"),
+                    getCell("hba1c_pre_diabetes"),
+                    getCell("hba1c_diabetes")
                 ]
             },
             {
@@ -61,8 +68,8 @@ const Haematology: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "4.4 CD4"),
-                    getCell(),
-                    getCell("", "", 2),
+                    getCell("total_cd4"),
+                    getCell("cd4_less_than_500", "", 2),
                 ]
             },
             {
@@ -73,7 +80,7 @@ const Haematology: React.FC = () => {
                 ]
             },
             {
-                tableCells: [getCell("", "4.5 Sickling test"), getCell(), getCell("", "", 2)]
+                tableCells: [getCell("", "4.5 Sickling test"), getCell("total_sickling"), getCell("positive_sickling", "", 2)]
             },
             {
                 tableCells: [getCell("", "4.6 Peripheral blood films"), getCell(), getCell("", "", 2)]
@@ -82,10 +89,10 @@ const Haematology: React.FC = () => {
                 tableCells: [getCell("", "4.7 BMA"), getCell(), getCell("", "", 2)]
             },
             {
-                tableCells: [getCell("", "4.8 Coagulation profile"), getCell(), getCell("", "", 2)]
+                tableCells: [getCell("", "4.8 Coagulation profile"), getCell("total_coagulation_profile"), getCell("", "", 2)]
             },
             {
-                tableCells: [getCell("", "4.9 Reticulocyte"), getCell(), getCell("", "", 2)]
+                tableCells: [getCell("", "4.9 Reticulocyte"), getCell("total_reticulocyte"), getCell("", "", 2)]
             },
             {
                 tableCells: [
@@ -110,7 +117,7 @@ const Haematology: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "4.11 Total blood group tests", 3),
-                    getCell(),
+                    getCell("total_blood_group"),
                 ]
             },
             {
@@ -149,23 +156,23 @@ const Haematology: React.FC = () => {
                 ]
             },
             {
-                tableCells: [getCell("", "4.19 HIV", 3), getCell()]
+                tableCells: [getCell("", "4.19 HIV", 3), getCell("positive_hiv")]
             },
             {
-                tableCells: [getCell("", "4.20 Hepatitis B", 3), getCell()]
+                tableCells: [getCell("", "4.20 Hepatitis B", 3), getCell("positive_hep_b")]
             },
             {
-                tableCells: [getCell("", "4.21 Hepatitis C", 3), getCell()]
+                tableCells: [getCell("", "4.21 Hepatitis C", 3), getCell("positive_hep_c")]
             },
             {
-                tableCells: [getCell("", "4.22 Syphilis", 3), getCell()]
+                tableCells: [getCell("", "4.22 Syphilis", 3), getCell("positive_syphilis")]
             },
         ]
     }, []);
 
 
     return <TableWrapper>
-        <TableRowMapper tableRows={tableRows} />
+        <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }