@ampath/esm-reports-app 1.0.0-next.51 → 1.0.0-next.52

package/src/reports/moh-745/registers/type.ts

@@ -28,3 +28,154 @@ export const moh412Columns = [
   'follow_up_date',
   'remarks',
 ];
+
+export type CancerScreeningResult = {
+  dc__screening_visit_type__initial__age_range__less_than_25__screened_via_or_via_vili: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__screened_via_or_via_vili: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__screened_via_or_via_vili: string;
+  screened_via_or_via_vili_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__screened_via_or_via_vili: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__screened_via_or_via_vili: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__screened_via_or_via_vili: string;
+  screened_via_or_via_vili_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__screened_via_or_via_vili: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__screened_via_or_via_vili: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__screened_via_or_via_vili: string;
+  screened_via_or_via_vili_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__screened_pap_smear: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__screened_pap_smear: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__screened_pap_smear: string;
+  screened_pap_smear_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__screened_pap_smear: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__screened_pap_smear: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__screened_pap_smear: string;
+  screened_pap_smear_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__screened_pap_smear: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__screened_pap_smear: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__screened_pap_smear: string;
+  screened_pap_smear_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__screened_hpv: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__screened_hpv: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__screened_hpv: string;
+  screened_hpv_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__screened_hpv: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__screened_hpv: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__screened_hpv: string;
+  screened_hpv_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__screened_hpv: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__screened_hpv: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__screened_hpv: string;
+  screened_hpv_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__positive_via_or_via_vili_test_result: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__positive_via_or_via_vili_test_result: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__positive_via_or_via_vili_test_result: string;
+  positive_via_or_via_vili_test_result_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__positive_via_or_via_vili_test_result: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__positive_via_or_via_vili_test_result: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__positive_via_or_via_vili_test_result: string;
+  positive_via_or_via_vili_test_result_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__positive_via_or_via_vili_test_result: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__positive_via_or_via_vili_test_result: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__positive_via_or_via_vili_test_result: string;
+  positive_via_or_via_vili_test_result_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__positive_hpv_test_result: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__positive_hpv_test_result: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__positive_hpv_test_result: string;
+  positive_hpv_test_result_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__positive_hpv_test_result: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__positive_hpv_test_result: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__positive_hpv_test_result: string;
+  positive_hpv_test_result_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__positive_hpv_test_result: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__positive_hpv_test_result: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__positive_hpv_test_result: string;
+  positive_hpv_test_result_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__via_or_via_vili_suspicious_lesion: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__via_or_via_vili_suspicious_lesion: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__via_or_via_vili_suspicious_lesion: string;
+  via_or_via_vili_suspicious_lesion_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__via_or_via_vili_suspicious_lesion: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__via_or_via_vili_suspicious_lesion: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__via_or_via_vili_suspicious_lesion: string;
+  via_or_via_vili_suspicious_lesion_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__via_or_via_vili_suspicious_lesion: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__via_or_via_vili_suspicious_lesion: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__via_or_via_vili_suspicious_lesion: string;
+  via_or_via_vili_suspicious_lesion_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_cyrotherapy: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__treated_via_thermo_coagulation: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__treated_via_thermo_coagulation: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__treated_via_thermo_coagulation: string;
+  treatment_method_thermo_coagulation_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__treated_via_thermo_coagulation: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__treated_via_thermo_coagulation: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__treated_via_thermo_coagulation: string;
+  treatment_method_thermo_coagulation_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_thermo_coagulation: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_thermo_coagulation: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_thermo_coagulation: string;
+  treatment_method_thermo_coagulation_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__treated_via_leep: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__treated_via_leep: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__treated_via_leep: string;
+  treatment_method_leep_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__treated_via_leep: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__treated_via_leep: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__treated_via_leep: string;
+  treatment_method_leep_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_leep: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_leep: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_leep: string;
+  treatment_method_leep_post_treatment_visit: string;
+  dc__screening_visit_type__initial__age_range__less_than_25__treated_via_other: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__treated_via_other: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__treated_via_other: string;
+  treatment_method_other_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__treated_via_other: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__treated_via_other: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__treated_via_other: string;
+  treatment_method_other_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_other: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_other: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_other: string;
+  treatment_method_other_post_treatment_visit: string;
+
+  dc__screening_visit_type__initial__age_range__less_than_25__hiv_positive_screened: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__hiv_positive_screened: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__hiv_positive_screened: string;
+  hiv_positive_screened_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__hiv_positive_screened: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__hiv_positive_screened: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__hiv_positive_screened: string;
+  hiv_positive_screened_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_positive_screened: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_positive_screened: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_positive_screened: string;
+  hiv_positive_screened_post_treatment_visit: string;
+
+  dc__screening_visit_type__initial__age_range__less_than_25__hiv_positive_screened_positive_result: string;
+  dc__screening_visit_type__initial__age_range__25_to_49__hiv_positive_screened_positive_result: string;
+  dc__screening_visit_type__initial__age_range__50_and_above__hiv_positive_screened_positive_result: string;
+  hiv_positive_screened_positive_result_initial_visit: string;
+  dc__screening_visit_type__routine__age_range__less_than_25__hiv_positive_screened_positive_result: string;
+  dc__screening_visit_type__routine__age_range__25_to_49__hiv_positive_screened_positive_result: string;
+  dc__screening_visit_type__routine__age_range__50_and_above__hiv_positive_screened_positive_result: string;
+  hiv_positive_screened_positive_result_routine_visit: string;
+  dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_positive_screened_positive_result: string;
+  dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_positive_screened_positive_result: string;
+  dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_positive_screened_positive_result: string;
+  hiv_positive_screened_positive_result_post_treatment_visit: string;
+
+};
+
+export type Moh745reponse = {
+  result: CancerScreeningResult[];
+}

package/src/resources/moh-745.resource.ts

@@ -7,6 +7,7 @@ import {
   type PatientListPage,
   type PatientListParams,
 } from './patient-list-page';
+import {type  Moh745reponse, type CancerScreeningResult } from '../reports/moh-745/registers/type';
 
 interface Moh745Params {
   locationUuids: string;
@@ -15,7 +16,7 @@ interface Moh745Params {
   indicator?: string | string[];
 }
 
-export async function getMoh745(params: Moh745Params): Promise<any> {
+export async function getMoh745(params: Moh745Params): Promise<CancerScreeningResult> {
   const url = await buildEtlUrl('moh-745', {
     locationUuids: params.locationUuids || '',
     startDate: params.startDate || '',
@@ -24,13 +25,8 @@ export async function getMoh745(params: Moh745Params): Promise<any> {
   try {
     const response = await openmrsFetch(url);
 
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`Failed to fetch dashboard summary: ${response.status} - ${errorText}`);
-    }
-
-    const data = await response.json();
-    return data;
+    const data = await response.json() as Moh745reponse;
+    return data?.result[0] ?? null;
   } catch (error: any) {
     throw new Error(`An error occurred while fetching the MOH-710 report: ${error.message}`);
   }