@ampath/esm-reports-app 1.0.0-next.7 → 1.0.0-next.70

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

@@ -1,43 +1,43 @@
 import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/react';
 import TableWrapper from "../../../table-wrapper/table-wrapper.component";
-import styles from '../../../table-wrapper/table-wrapper.scss';
+import { getCell } from "../../../../utils/utils";
+import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
 
-const Haematology: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
+interface HaematologyProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
 
+const Haematology: React.FC<HaematologyProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
                 tableCells: [
-                    getCell("", "4 HAEMATOLOGY", 4, true)
+                    getCell("", "4 HAEMATOLOGY", 4, 1, true)
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "Haematology tests", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "HB <5 g/dl", 1, true),
-                    getCell("", "HB between 5 and 10 g/dl", 1, true),
+                    getCell("", "Haematology tests", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "HB <5 g/dl", 1, 1, true),
+                    getCell("", "HB between 5 and 10 g/dl", 1, 1, true),
                 ]
             },
             {
                 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()
                 ]
@@ -45,42 +45,42 @@ const Haematology: React.FC = () => {
             {
                 tableCells: [
                     getCell(),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Pre-diabetes", 1, true),
-                    getCell("", "Diabetes", 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Pre-diabetes", 1, 1, true),
+                    getCell("", "Diabetes", 1, 1, true),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "Hemoglobin A1c (HbA1c)"),
-                    getCell(),
-                    getCell(),
-                    getCell()
+                    getCell("total_hba1c"),
+                    getCell("hba1c_pre_diabetes"),
+                    getCell("hba1c_diabetes")
                 ]
             },
             {
                 tableCells: [
                     getCell(),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Number <500", 2, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Number <500", 2, 1, true),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "4.4 CD4"),
-                    getCell(),
-                    getCell("", "", 2),
+                    getCell("total_cd4"),
+                    getCell("cd4_less_than_500", "", 2),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "Other Haematology tests", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Number Positive", 2, true),
+                    getCell("", "Other Haematology tests", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Number Positive", 2, 1, true),
                 ]
             },
             {
-                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)]
@@ -89,16 +89,16 @@ 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: [
                     getCell(),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "High", 2, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "High", 2, 1, true),
                 ]
             },
             {
@@ -110,14 +110,14 @@ const Haematology: React.FC = () => {
             },
             {
                 tableCells: [
-                    getCell("", "Blood Grouping", 3, true),
-                    getCell("", "Number", 1, true),
+                    getCell("", "Blood Grouping", 3, 1, true),
+                    getCell("", "Number", 1, 1, true),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "4.11 Total blood group tests", 3),
-                    getCell(),
+                    getCell("total_blood_group"),
                 ]
             },
             {
@@ -128,7 +128,7 @@ const Haematology: React.FC = () => {
             },
             {
                 tableCells: [
-                    getCell("", "Blood Safety", 4, true),
+                    getCell("", "Blood Safety", 4, 1, true),
                 ]
             },
             {
@@ -151,36 +151,28 @@ const Haematology: React.FC = () => {
             },
             {
                 tableCells: [
-                    getCell("", "Blood Screening at facility", 3, true),
-                    getCell("", "Number Positive", 1, true),
+                    getCell("", "Blood Screening at facility", 3, 1, true),
+                    getCell("", "Number Positive", 1, 1, true),
                 ]
             },
             {
-                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>
-        {tableRows.map((tR) => (
-            <TableRow>
-                {tR.tableCells.map((tC) => (
-                    <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
-                        {tC.strong ? <strong>{tC.value}</strong> : tC.value}
-                    </TableCell>
-                ))}
-            </TableRow>
-        ))}
+        <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }
 

package/src/reports/moh-706/sub-reports/histology-and-cytology/histology-and-cytology.component.tsx

@@ -1,26 +1,19 @@
 import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/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";
 
 const HistologyAndCytology: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
-
     const tableRows = useMemo(() => {
         return [
             {
-                tableCells: [getCell("", "6 HISTOLOGY AND CYTOLOGY", 4, true)]
+                tableCells: [getCell("", "6 HISTOLOGY AND CYTOLOGY", 4, 1, true)]
             },
             {
                 tableCells: [
-                    getCell("", "Smears", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Malignant", 1, true),
+                    getCell("", "Smears", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Malignant", 1, 1, true),
                     getCell(),
                 ]
             },
@@ -29,74 +22,66 @@ const HistologyAndCytology: React.FC = () => {
             { tableCells: [getCell("", "6.3 Tissue impressions"), getCell(), getCell(), getCell()] },
             {
                 tableCells: [
-                    getCell("", "Fine Needle Aspirates", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Malignant", 1, true),
+                    getCell("", "Fine Needle Aspirates", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Malignant", 1, 1, true),
                     getCell()
                 ]
             },
-            { tableCells: [getCell("", "6.4 Thyroid"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.5 Lymph nodes"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.6 Liver"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.7 Breast"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.8 Soft tissue masses"), getCell(), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.4 Thyroid"), getCell("total_cyt_thyroid"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.5 Lymph nodes"), getCell("total_cyt_lymph_nodes"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.6 Liver"), getCell("total_cyt_liver"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.7 Breast"), getCell("total_cyt_breast"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.8 Soft tissue masses"), getCell("total_cyt_soft_tissue"), getCell(), getCell()] },
             {
                 tableCells: [
-                    getCell("", "Fluid Cytology", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Malignant", 2, true),
+                    getCell("", "Fluid Cytology", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Malignant", 2, 1, true),
                     getCell()
                 ]
             },
-            { tableCells: [getCell("", "6.9 Ascitic fluid"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.10 CSF"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.11 Pleural fluid"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.12 Urine"), getCell(), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.9 Ascitic fluid"), getCell("total_cyt_ascitic_fluid"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.10 CSF"), getCell("total_cyt_csf"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.11 Pleural fluid"), getCell("total_cyt_pleural_fluid"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.12 Urine"), getCell("total_cyt_urine"), getCell(), getCell()] },
             {
                 tableCells: [
-                    getCell("", "Tissue Histology", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Malignant", 1, true),
-                    getCell("", "TNM Stage", 1, true),
+                    getCell("", "Tissue Histology", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Malignant", 1, 1, true),
+                    getCell("", "TNM Stage", 1, 1, true),
                 ]
             },
-            { tableCells: [getCell("", "6.13 Prostate"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.14 Breast tissue"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.15 Ovary"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.16 Uterus (Cervix)"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.17 Uterus (Endometrium)"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.18 Skin"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.19 Head and Neck"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.20 Oral"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.21 Esophagus"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.22 Colorectal"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.23 Hepatobiliary"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.24 Soft tissue and bone"), getCell(), getCell(), getCell()] },
-            { tableCells: [getCell("", "6.25 Lymph nodes tissue"), getCell(), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.13 Prostate"), getCell("total_cyt_prostate"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.14 Breast tissue"), getCell("total_cyt_breast_tissue"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.15 Ovary"), getCell("total_cyt_ovary"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.16 Uterus (Cervix)"), getCell("total_cyt_uterus_cervix"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.17 Uterus (Endometrium)"), getCell("total_cyt_uterus_endometrium"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.18 Skin"), getCell("total_cyt_skin"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.19 Head and Neck"), getCell("total_cyt_head_neck"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.20 Oral"), getCell("total_cyt_oral"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.21 Esophagus"), getCell("total_cyt_esophagus"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.22 Colorectal"), getCell("total_cyt_colorectal"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.23 Hepatobiliary"), getCell("total_cyt_hepatobiliary"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.24 Soft tissue and bone"), getCell("total_cyt_soft_tissue_bone"), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.25 Lymph nodes tissue"), getCell("total_cyt_lymph_nodes_tissue"), getCell(), getCell()] },
             {
                 tableCells: [
-                    getCell("", "Bone Marrow Studies", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Malignant", 1, true),
+                    getCell("", "Bone Marrow Studies", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Malignant", 1, 1, true),
                     getCell()
                 ]
             },
-            { tableCells: [getCell("", "6.26 Bone marrow aspirate"), getCell(), getCell(), getCell()] },
+            { tableCells: [getCell("", "6.26 Bone marrow aspirate"), getCell("total_cyt_bone_marrow"), getCell(), getCell()] },
             { tableCells: [getCell("", "6.27 Trephine biopsy"), getCell(), getCell(), getCell()] },
         ]
     }, []);
 
 
     return <TableWrapper>
-        {tableRows.map((tR) => (
-            <TableRow>
-                {tR.tableCells.map((tC) => (
-                    <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
-                        {tC.strong ? <strong>{tC.value}</strong> : tC.value}
-                    </TableCell>
-                ))}
-            </TableRow>
-        ))}
+        <TableRowMapper tableRows={tableRows} />
     </TableWrapper>
 }
 

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

@@ -1,70 +1,70 @@
 import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/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";
 
-const Parasitology: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
+interface ParasitologyProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
 
+const Parasitology: React.FC<ParasitologyProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
                 tableCells: [
-                    getCell("", "3 PARASITOLOGY", 3, true)
+                    getCell("", "3 PARASITOLOGY", 3, 1, true)
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "Malaria Test", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Number Positive", 1, true)
+                    getCell("", "Malaria Test", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Number Positive", 1, 1, true)
                 ]
             },
             {
                 tableCells: [
                     getCell("", "3.1 Malaria BS (Under five years)"),
-                    getCell(),
-                    getCell()
+                    getCell("total_malaria_bs_under_5"),
+                    getCell("positive_malaria_bs_under_5")
                 ]
             },
             {
                 tableCells: [
                     getCell("", "3.2 Malaria BS (5 years and above)"),
-                    getCell(),
-                    getCell(),
+                    getCell("total_malaria_bs_5_and_above"),
+                    getCell("positive_malaria_bs_5_and_above"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "3.3 Malaria Rapid Diagnostic Tests (Under five years)"),
-                    getCell(),
-                    getCell(),
+                    getCell("total_malaria_rdt_under_5"),
+                    getCell("positive_malaria_rdt_under_5"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "3.4 Malaria Rapid Diagnostic Tests (5 years and above)"),
-                    getCell(),
-                    getCell(),
+                    getCell("total_malaria_rdt_5_and_above"),
+                    getCell("positive_malaria_rdt_5_and_above"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "Stool Examination", 1, true),
-                    getCell(),
-                    getCell("", "Number Positive", 1, true),
+                    getCell("", "Stool Examination", 1, 1, true),
+                    getCell("total_stool_examination"),
+                    getCell("positive_stool_examination"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "3.5 Taenia spp."),
-                    getCell(),
-                    getCell(),
+                    getCell("total_taenia"),
+                    getCell("positive_taenia"),
                 ]
             },
             {
@@ -77,15 +77,15 @@ const Parasitology: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "3.7 Hookworm"),
-                    getCell(),
-                    getCell(),
+                    getCell("total_hookworm"),
+                    getCell("positive_hookworm"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "3.8 Roundworm"),
-                    getCell(),
-                    getCell(),
+                    getCell("total_roundworms"),
+                    getCell("positive_roundworms"),
                 ]
             },
             {
@@ -114,15 +114,7 @@ const Parasitology: React.FC = () => {
 
 
     return <TableWrapper>
-        {tableRows.map((tR) => (
-            <TableRow>
-                {tR.tableCells.map((tC) => (
-                    <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
-                        {tC.strong ? <strong>{tC.value}</strong> : tC.value}
-                    </TableCell>
-                ))}
-            </TableRow>
-        ))}
+         <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }
 

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

@@ -1,54 +1,46 @@
 import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/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";
 
-const Serology: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
+interface SerologyProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
 
+const Serology: React.FC<SerologyProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
-                tableCells: [getCell("", "7. SEROLOGY", 3, true)]
+                tableCells: [getCell("", "7. SEROLOGY", 3, 1, true)]
             },
             {
                 tableCells: [
-                    getCell("", "Serological Test", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Number Positive", 1, true),
+                    getCell("", "Serological Test", 1, 1, true),
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Number Positive", 1, 1, true),
                 ]
             },
-            { tableCells: [getCell("", "7.1 VDRL"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.2 TPHA"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.3 ASOT"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.4 HIV"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.5 Brucella"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.6 Rheumatoid factor"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.7 Helicobacter pylori"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.8 Hepatitis A test"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.9 Hepatitis B test"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.10 Hepatitis C test"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.11 HCG"), getCell(), getCell()] },
-            { tableCells: [getCell("", "7.12 CRAG Test"), getCell(), getCell()] },
+            { tableCells: [getCell("", "7.1 VDRL"), getCell("total_vdrl"), getCell("positive_vdrl")] },
+            { tableCells: [getCell("", "7.2 TPHA"), getCell("total_tpha"), getCell("positive_tpha")] },
+            { tableCells: [getCell("", "7.3 ASOT"), getCell("total_asot"), getCell()] },
+            { tableCells: [getCell("", "7.4 HIV"), getCell("total_hiv"), getCell("hiv_new_diagnosis")] },
+            { tableCells: [getCell("", "7.5 Brucella"), getCell("total_brucella"), getCell("positive_brucella")] },
+            { tableCells: [getCell("", "7.6 Rheumatoid factor"), getCell("total_rheumatoid_factor"), getCell("positive_rheumatoid_factor")] },
+            { tableCells: [getCell("", "7.7 Helicobacter pylori"), getCell("total_h_pylori"), getCell("positive_h_pylori")] },
+            { tableCells: [getCell("", "7.8 Hepatitis A test"), getCell("total_hep_a"), getCell("positive_hep_a")] },
+            { tableCells: [getCell("", "7.9 Hepatitis B test"), getCell("total_hep_b"), getCell("positive_hep_b")] },
+            { tableCells: [getCell("", "7.10 Hepatitis C test"), getCell("total_hep_c"), getCell("positive_hep_c")] },
+            { tableCells: [getCell("", "7.11 HCG"), getCell("total_hcg"), getCell("positive_hcg")] },
+            { tableCells: [getCell("", "7.12 CRAG Test"), getCell("total_crag"), getCell("positive_crag")] },
         ]
     }, []);
 
 
     return <TableWrapper>
-        {tableRows.map((tR) => (
-            <TableRow>
-                {tR.tableCells.map((tC) => (
-                    <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
-                        {tC.strong ? <strong>{tC.value}</strong> : tC.value}
-                    </TableCell>
-                ))}
-            </TableRow>
-        ))}
+         <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }
 

package/src/reports/moh-706/sub-reports/specimen-referral-to-higher-levels/specimen-referral-to-higher-levels.component.tsx

@@ -1,33 +1,26 @@
 import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/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";
 
 const SpecimenReferralToHigherLevels: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
-
     const tableRows = useMemo(() => {
         return [
             {
-                tableCells: [getCell("", "8. SPECIMEN REFERRAL TO HIGHER LEVELS", 3, true)]
+                tableCells: [getCell("", "8. SPECIMEN REFERRAL TO HIGHER LEVELS", 3, 1, true)]
             },
             {
                 tableCells: [
-                    getCell("", "Specimen referral", 1, true),
-                    getCell("", "No. of specimens", 1, true),
-                    getCell("", "No. of results received", 1, true),
+                    getCell("", "Specimen referral", 1, 1, true),
+                    getCell("", "No. of specimens", 1, 1, true),
+                    getCell("", "No. of results received", 1, 1, true),
                 ]
             },
             { tableCells: [getCell("", "8.1 CD4"), getCell(), getCell()] },
-            { tableCells: [getCell("", "8.2 Viral load"), getCell(), getCell()] },
+            { tableCells: [getCell("", "8.2 Viral load"), getCell("total_viral_load_specimens"), getCell("viral_load_results_received")] },
             { tableCells: [getCell("", "8.3 EID"), getCell(), getCell()] },
             { tableCells: [getCell("", "8.4 Discodant/discrepant"), getCell(), getCell()] },
-            { tableCells: [getCell("", "8.5 TB Culture"), getCell(), getCell()] },
+            { tableCells: [getCell("", "8.5 TB Culture"), getCell("total_tb_culture_specimens"), getCell("tb_culture_results_received")] },
             { tableCells: [getCell("", "8.6 Virological"), getCell(), getCell()] },
             { tableCells: [getCell("", "8.7 Clinical Chemistry"), getCell(), getCell()] },
             { tableCells: [getCell("", "8.8 Histology/cytology"), getCell(), getCell()] },
@@ -39,15 +32,7 @@ const SpecimenReferralToHigherLevels: React.FC = () => {
 
 
     return <TableWrapper>
-        {tableRows.map((tR) => (
-            <TableRow>
-                {tR.tableCells.map((tC) => (
-                    <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
-                        {tC.strong ? <strong>{tC.value}</strong> : tC.value}
-                    </TableCell>
-                ))}
-            </TableRow>
-        ))}
+         <TableRowMapper tableRows={tableRows} />
     </TableWrapper>
 }