@ampath/esm-reports-app 1.0.0-next.5 → 1.0.0-next.50

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

@@ -1,21 +1,22 @@
 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 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 BloodChemistry: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
+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, true),
+                    getCell("", "2. BLOOD CHEMISTRY", 4, 1, true),
                 ]
             },
             {
@@ -25,31 +26,31 @@ const BloodChemistry: React.FC = () => {
             },
             {
                 tableCells: [
-                    getCell("", "Blood Sugar Test", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Low", 1, true),
-                    getCell("", "High", 1, true),
+                    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(),
+                    getCell("total_blood_sugar"),
+                    getCell("min_blood_sugar"),
+                    getCell("max_blood_sugar"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.2 OGTT"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_ogtt"),
+                    getCell("min_ogtt"),
+                    getCell("max_ogtt"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "2.3 Renal Function Test", 1, true),
+                    getCell("", "2.3 Renal Function Test", 1, 1, true),
                     getCell(),
                     getCell(),
                     getCell(),
@@ -58,9 +59,9 @@ const BloodChemistry: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "2.4 Creatinine"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_creatinine"),
+                    getCell("min_creatinine"),
+                    getCell("max_creatinine"),
                 ]
             },
             {
@@ -74,38 +75,39 @@ const BloodChemistry: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "2.5 Urea"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urea"),
+                    getCell("min_urea"),
+                    getCell("max_urea"),
                 ]
             },
+
             {
                 tableCells: [
                     getCell("", "2.6 Sodium"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_sodium"),
+                    getCell("min_sodium"),
+                    getCell("max_sodium"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.7 Potassium"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_potassium"),
+                    getCell("min_potassium"),
+                    getCell("max_potassium"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.8 Chlorides"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_chlorides"),
+                    getCell("min_chlorides"),
+                    getCell("max_chlorides"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "2.8 Liver Function Test", 1, true),
+                    getCell("", "2.8 Liver Function Test", 1, 1, true),
                     getCell(),
                     getCell(),
                     getCell(),
@@ -114,135 +116,136 @@ const BloodChemistry: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "2.9 Direct bilirubin"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_direct_bili"),
+                    getCell("min_direct_bili"),
+                    getCell("max_direct_bili"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.10 Total bilirubin"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_total_bili"),
+                    getCell("min_total_bili"),
+                    getCell("max_total_bili"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.11 ASAT (SGOT)"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_ast"),
+                    getCell("min_ast"),
+                    getCell("max_ast"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.12 ALAT (SGPT)"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_alt"),
+                    getCell("min_alt"),
+                    getCell("max_alt"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.13 Serum Protein"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_total_protein"),
+                    getCell("min_total_protein"),
+                    getCell("max_total_protein"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.14 Albumin"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_albumin"),
+                    getCell("min_albumin"),
+                    getCell("max_albumin"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.15 Alkaline Phosphatase"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_alk_phos"),
+                    getCell("min_alk_phos"),
+                    getCell("max_alk_phos"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "2.16 Lipid Profile", 1, true),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("", "2.16 Lipid Profile", 1, 1, true),
+                    getCell("total_lipid_profile"),
+                    getCell("min_lipid_profile"),
+                    getCell("max_lipid_profile"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.17 Total cholesterol"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_total_cholesterol"),
+                    getCell("min_total_cholesterol"),
+                    getCell("max_total_cholesterol"),
                 ]
             },
+
             {
                 tableCells: [
                     getCell("", "2.18 Triglycerides"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_triglycerides"),
+                    getCell("min_triglycerides"),
+                    getCell("max_triglycerides"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.19 LDL"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_ldl"),
+                    getCell("min_ldl"),
+                    getCell("max_ldl"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "Hormonal Test", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Low", 1, true),
-                    getCell("", "High", 1, true),
+                    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(),
+                    getCell("total_t3"),
+                    getCell("min_t3"),
+                    getCell("max_t3"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.21 T4"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_t4"),
+                    getCell("min_t4"),
+                    getCell("max_t4"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.22 TSH"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_tsh"),
+                    getCell("min_tsh"),
+                    getCell("max_tsh"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "Tumor Markers", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Number Positive", 2, true),
+                    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),
+                    getCell("total_psa"),
+                    getCell("positive_psa", "", 2),
                 ]
             },
             {
@@ -255,8 +258,8 @@ const BloodChemistry: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "2.25 CA 19-9"),
-                    getCell(),
-                    getCell("", "", 2),
+                    getCell("total_ca_19_9"),
+                    getCell("positive_ca_19_9", "", 2),
                 ]
             },
             {
@@ -269,55 +272,46 @@ const BloodChemistry: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "2.27 CEA"),
-                    getCell(),
-                    getCell("", "", 2),
+                    getCell("total_cea"),
+                    getCell("positive_cea", "", 2),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.28 AFP"),
-                    getCell(),
-                    getCell("", "", 2),
+                    getCell("total_afp"),
+                    getCell("positive_afp", "", 2),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "CSF Chemistry", 1, true),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Low", 1, true),
-                    getCell("", "High", 1, true),
+                    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(),
+                    getCell("total_proteins"),
+                    getCell("min_proteins"),
+                    getCell("max_proteins"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "2.30 Glucose"),
-                    getCell(),
-                    getCell(),
-                    getCell(),
+                    getCell("total_glucose"),
+                    getCell("min_glucose"),
+                    getCell("max_glucose"),
                 ]
             },
         ]
     }, []);
 
-
     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/drug-susceptibility-testing/drug-susceptibility-testing.component.tsx

@@ -1,147 +1,128 @@
 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 TableWrapper from "../../../table-wrapper/table-wrapper.component";
+import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
+import { getCell } from "../../../../utils/utils";
 
 const DrugSusceptibilityTesting: React.FC = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
+    const cells = Array.from({ length: 25 }, (_, i) => getCell());
 
     const tableRows = useMemo(() => {
         return [
             {
-                tableCells: [getCell("", "9. DRUG SUSCEPTIBILITY TESTING", 12, true)]
+                tableCells: [getCell("", "9. DRUG SUSCEPTIBILITY TESTING", 12, 1, true)]
             },
             {
                 tableCells: [
-                    getCell("", "Drug Resistance Pattern", 1, true),
-                    getCell("", "a. Ciprofloxacin", 1, true),
-                    getCell("", "b. Levofloxacin", 1, true),
-                    getCell("", "c. Gentamicin", 1, true),
-                    getCell("", "d. Tetracycline", 1, true),
-                    getCell("", "e. Ceftazidime", 1, true),
-                    getCell("", "f. Cefuroxime", 1, true),
-                    getCell("", "g. Cefotaxime", 1, true),
-                    getCell("", "h. Ampicillin", 1, true),
-                    getCell("", "i. Cefazolin", 1, true),
-                    getCell("", "j. Amoxillin-Clavulanate", 1, true),
-                    getCell("", "k. Amikacin", 1, true),
+                    getCell("", "Drug Resistance Pattern", 1, 1, true),
+                    getCell("", "a. Ciprofloxacin", 1, 1, true),
+                    getCell("", "b. Levofloxacin", 1, 1, true),
+                    getCell("", "c. Gentamicin", 1, 1, true),
+                    getCell("", "d. Tetracycline", 1, 1, true),
+                    getCell("", "e. Ceftazidime", 1, 1, true),
+                    getCell("", "f. Cefuroxime", 1, 1, true),
+                    getCell("", "g. Cefotaxime", 1, 1, true),
+                    getCell("", "h. Ampicillin", 1, 1, true),
+                    getCell("", "i. Cefazolin", 1, 1, true),
+                    getCell("", "j. Amoxillin-Clavulanate", 1, 1, true),
+                    getCell("", "k. Amikacin", 1, 1, true),
+                    getCell("", "m. Chloramphenicol", 1, 1, true),
+                    getCell("", "n. Cefepime", 1, 1, true),
+                    getCell("", "p. Piperacillin-tazobactam", 1, 1, true),
+                    getCell("", "q. obramycin", 1, 1, true),
+                    getCell("", "r. Ampicillin Sulbactam", 1, 1, true),
+                    getCell("", "s. Trimethoprim Sulfamethoxazole", 1, 1, true),
+                    getCell("", "t. Penicillin", 1, 1, true),
+                    getCell("", "u. Vancomycin", 1, 1, true),
+                    getCell("", "v. Meropenem", 1, 1, true),
+                    getCell("", "w. Clindamycin", 1, 1, true),
+                    getCell("", "x. Doxycycline/tetracyclin", 1, 1, true),
+                    getCell("", "y. Ceftazidime-avibactam", 1, 1, true),
+                    getCell("", "z. Erythromycin", 1, 1, true),
+                    getCell("", "aa. Gentamicin", 1, 1, true),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.1 E. coli O157:H7"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.2 Proteus spp"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.3 Salmonella spp"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.4 Shigella spp"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.5 Klebsiella pneumoniae"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.6 Pseudomonas spp"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.7 Staphylococcus aureus"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.8 Vibrio cholerae spp"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.9 Neisseria meningitidis"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.10 Neisseria gonorrhoeae"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.11 Streptococcus pneumoniae"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.12 Haemophilus influenzae"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.13 Haemophilus parainfluenzae"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
             {
                 tableCells: [
                     getCell("", "9.14 Bacterial vaginosis"),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell(), getCell(),
-                    getCell(), getCell(), getCell()
+                    ...cells
                 ]
             },
         ]
@@ -149,15 +130,7 @@ const DrugSusceptibilityTesting: 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>
 }