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

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

@@ -28,11 +28,11 @@ const HistologyAndCytology: React.FC = () => {
                     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, 1, true),
@@ -41,10 +41,10 @@ const HistologyAndCytology: React.FC = () => {
                     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, 1, true),
@@ -53,19 +53,19 @@ const HistologyAndCytology: React.FC = () => {
                     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, 1, true),
@@ -74,7 +74,7 @@ const HistologyAndCytology: React.FC = () => {
                     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()] },
         ]
     }, []);

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

@@ -3,7 +3,14 @@ import TableWrapper from "../../../table-wrapper/table-wrapper.component";
 import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
 import { getCell } from "../../../../utils/utils";
 
-const Parasitology: React.FC = () => {
+interface ParasitologyProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
+
+const Parasitology: React.FC<ParasitologyProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
@@ -21,43 +28,43 @@ const Parasitology: React.FC = () => {
             {
                 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, 1, true),
-                    getCell(),
-                    getCell("", "Number Positive", 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"),
                 ]
             },
             {
@@ -70,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"),
                 ]
             },
             {
@@ -107,7 +114,7 @@ const Parasitology: React.FC = () => {
 
 
     return <TableWrapper>
-         <TableRowMapper tableRows={tableRows} />
+         <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }
 

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

@@ -3,7 +3,14 @@ import TableWrapper from "../../../table-wrapper/table-wrapper.component";
 import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
 import { getCell } from "../../../../utils/utils";
 
-const Serology: React.FC = () => {
+interface SerologyProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
+
+const Serology: React.FC<SerologyProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
@@ -16,24 +23,24 @@ const Serology: React.FC = () => {
                     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>
-         <TableRowMapper tableRows={tableRows} />
+         <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

@@ -17,10 +17,10 @@ const SpecimenReferralToHigherLevels: React.FC = () => {
                 ]
             },
             { 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()] },

package/src/reports/moh-706/sub-reports/urine-analysis/urine-analysis.component.tsx

@@ -3,7 +3,14 @@ import TableWrapper from "../../../table-wrapper/table-wrapper.component";
 import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
 import { getCell } from "../../../../utils/utils";
 
-const UrineAnalysis: React.FC = () => {
+interface UrineAnalysisProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
+
+const UrineAnalysis: React.FC<UrineAnalysisProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
@@ -22,71 +29,71 @@ const UrineAnalysis: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "1.1 Urine Chemistry", 1, 1, true),
-                    getCell(),
+                    getCell("total_urinalysis"),
                     getCell(),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.2 Glucose", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_glucose_with_members"),
+                    getCell("positive_urine_glucose_with_members"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.3 Ketones", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_ketones_with_members"),
+                    getCell("positive_urine_ketones_with_members"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.4 Proteins", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_proteins_with_members"),
+                    getCell("positive_urine_proteins_with_members"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.5 Urine Microscopy", 1, 1, true),
+                    getCell("total_urine_microscopy"),
                     getCell(),
-                    getCell("", "Number Positive", 1, 1, true),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.6 Pus cells (>5/hpf)", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_pus_cells_with_members"),
+                    getCell("positive_urine_pus_cells_with_members"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.7 Shistosoma haematobium", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_s_haematobium"),
+                    getCell("positive_urine_s_haematobium"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.8 Trichomona vaginalis", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_t_vaginalis_with_members"),
+                    getCell("positive_urine_t_vaginalis_with_members"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.9 Yeast cells", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_yeast_cells_with_members"),
+                    getCell("positive_urine_yeast_cells_with_members"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.10 Bacteria", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_bacteria"),
+                    getCell("positive_bacteria"),
                 ]
             },
         ]
@@ -94,7 +101,7 @@ const UrineAnalysis: React.FC = () => {
 
 
     return <TableWrapper>
-         <TableRowMapper tableRows={tableRows} />
+         <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }