@kenyaemr/esm-billing-app 5.4.2-pre.2676 → 5.4.2-pre.2682

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false},{"component":"billingAdmin","route":"billing-admin"}],"extensions":[{"component":"accountingDashboardLink","name":"accounting-dashboard-link","slots":["homepage-dashboard-slot"],"meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"name":"billing-dashboard","component":"billingDashboard","slot":"accounting-dashboard-slot"},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"patient-info-sha-status","component":"patientBannerShaStatus","slot":"patient-banner-tags-slot"},{"name":"payments-points-dashboard-link","component":"paymentPointDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"cashier-points","title":"Payment Point","slot":"payment-point-dashboard-slot"}},{"name":"payment-points-dashboard","component":"paymentPoints","slot":"payment-point-dashboard-slot"},{"name":"payment-mode-dashboard-link","component":"paymentModeLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-modes","title":"Payment Mode","slot":"payment-mode-dashboard-slot"}},{"name":"payment-mode-dashboard","component":"paymentModeDashboard","slot":"payment-mode-dashboard-slot"},{"name":"bill-deposit-dashboard-link","component":"billDepositDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"bill-deposit","title":"Bill Deposit","slot":"billing-deposit-dashboard-slot"}},{"name":"bill-deposit-dashboard","component":"billDepositDashboard","slot":"billing-deposit-dashboard-slot"},{"name":"billable-exemptions-dashboard-link","component":"billableExemptionsLink","slot":"billing-admin-dashboard-slot","meta":{"name":"billable-exemptions","title":"Billable Exemptions","slot":"billing-exemptions-dashboard-slot"}},{"name":"billable-exemptions-dashboard","component":"billableExemptions","slot":"billing-exemptions-dashboard-slot"},{"name":"clinical-charges-dashboard-link","component":"clinicalChargesLink","slot":"billing-admin-dashboard-slot","meta":{"name":"clinical-charges","title":"Clinical Charges","slot":"clinical-charges-dashboard-slot"}},{"name":"clinical-charges-dashboard","component":"clinicalCharges","slot":"clinical-charges-dashboard-slot"},{"name":"payment-history-dashboard-link","component":"paymentHistoryLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-history","title":"Payment History","slot":"payment-history-dashboard-slot"}},{"name":"payment-history-dashboard","component":"paymentHistoryDashboard","slot":"payment-history-dashboard-slot"},{"name":"patient-billing-dashboard-link","component":"patientBillingLink","slot":"billing-admin-dashboard-slot","meta":{"name":"patient-billing","title":"Patient Billing","slot":"patient-billing-dashboard-slot"}},{"name":"patient-billing-dashboard","component":"patientBilling","slot":"patient-billing-dashboard-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"version":"5.4.2-pre.2676"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false},{"component":"billingAdmin","route":"billing-admin"}],"extensions":[{"component":"accountingDashboardLink","name":"accounting-dashboard-link","slots":["homepage-dashboard-slot"],"meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"name":"billing-dashboard","component":"billingDashboard","slot":"accounting-dashboard-slot"},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"patient-info-sha-status","component":"patientBannerShaStatus","slot":"patient-banner-tags-slot"},{"name":"payments-points-dashboard-link","component":"paymentPointDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"cashier-points","title":"Payment Point","slot":"payment-point-dashboard-slot"}},{"name":"payment-points-dashboard","component":"paymentPoints","slot":"payment-point-dashboard-slot"},{"name":"payment-mode-dashboard-link","component":"paymentModeLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-modes","title":"Payment Mode","slot":"payment-mode-dashboard-slot"}},{"name":"payment-mode-dashboard","component":"paymentModeDashboard","slot":"payment-mode-dashboard-slot"},{"name":"bill-deposit-dashboard-link","component":"billDepositDashboardLink","slot":"billing-admin-dashboard-slot","meta":{"name":"bill-deposit","title":"Bill Deposit","slot":"billing-deposit-dashboard-slot"}},{"name":"bill-deposit-dashboard","component":"billDepositDashboard","slot":"billing-deposit-dashboard-slot"},{"name":"billable-exemptions-dashboard-link","component":"billableExemptionsLink","slot":"billing-admin-dashboard-slot","meta":{"name":"billable-exemptions","title":"Billable Exemptions","slot":"billing-exemptions-dashboard-slot"}},{"name":"billable-exemptions-dashboard","component":"billableExemptions","slot":"billing-exemptions-dashboard-slot"},{"name":"clinical-charges-dashboard-link","component":"clinicalChargesLink","slot":"billing-admin-dashboard-slot","meta":{"name":"clinical-charges","title":"Clinical Charges","slot":"clinical-charges-dashboard-slot"}},{"name":"clinical-charges-dashboard","component":"clinicalCharges","slot":"clinical-charges-dashboard-slot"},{"name":"payment-history-dashboard-link","component":"paymentHistoryLink","slot":"billing-admin-dashboard-slot","meta":{"name":"payment-history","title":"Payment History","slot":"payment-history-dashboard-slot"}},{"name":"payment-history-dashboard","component":"paymentHistoryDashboard","slot":"payment-history-dashboard-slot"},{"name":"patient-billing-dashboard-link","component":"patientBillingLink","slot":"billing-admin-dashboard-slot","meta":{"name":"patient-billing","title":"Patient Billing","slot":"patient-billing-dashboard-slot"}},{"name":"patient-billing-dashboard","component":"patientBilling","slot":"patient-billing-dashboard-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"version":"5.4.2-pre.2682"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.2-pre.2676",
+  "version": "5.4.2-pre.2682",
   "description": "Billing app for KenyaEMR",
   "keywords": [
     "openmrs"

package/src/benefits-package/forms/packages-and-interventions-form.component.tsx

@@ -11,39 +11,53 @@ type Props = {
   patientUuid: string;
 };
 
-const SHABenefitPackangesAndInterventions: React.FC<Props> = ({ patientUuid }) => {
+const SHABenefitPackagesAndInterventions: React.FC<Props> = ({ patientUuid }) => {
   const form = useFormContext<{ packages: Array<string>; interventions: Array<string>; policyNumber: string }>();
   const { shaIdentificationNumberUUID } = useConfig<BillingConfig>();
-  const { isLoading: packagesLoading, error: packageError, packages } = usePackages();
   const { t } = useTranslation();
   const { error, isLoading, patient } = usePatient(patientUuid);
+
+  const patientGender = useMemo(() => {
+    return patient?.gender === 'male' ? 'male' : 'female';
+  }, [patient]);
+
+  const {
+    isLoading: packagesLoading,
+    error: packageError,
+    packages,
+  } = usePackages({
+    applicable_gender: patientGender,
+  });
+
   const selectedPackageObservable = form.watch('packages');
   const shaNumber = useMemo(
     () => patient?.identifier?.find((id) => id?.type?.coding[0]?.code === shaIdentificationNumberUUID)?.value,
     [patient, shaIdentificationNumberUUID],
   );
+
   const { setValue } = form;
+
   useEffect(() => {
     if (shaNumber) {
       setValue('policyNumber', shaNumber);
     }
   }, [shaNumber, setValue]);
 
-  if (packagesLoading) {
+  if (isLoading || packagesLoading) {
     return (
       <InlineLoading description={t('loading', 'Loading')} iconDescription={t('loading', 'Loading data') + '...'} />
     );
   }
 
-  if (packageError) {
+  if (error || packageError) {
     return (
       <InlineNotification
         aria-label="closes notification"
         kind="error"
         lowContrast={true}
         statusIconDescription="notification"
-        title={t('errorLoadingpackages', 'Error loading packages')}
-        subtitle={packageError?.message}
+        title={t('errorLoadingData', 'Error loading data')}
+        subtitle={packageError?.message ?? error?.message}
       />
     );
   }
@@ -54,46 +68,44 @@ const SHABenefitPackangesAndInterventions: React.FC<Props> = ({ patientUuid }) =
         <Controller
           control={form.control}
           name="packages"
-          render={({ field }) => (
-            <>
-              {packageError ? (
-                <InlineNotification
-                  kind="error"
-                  subtitle={t('errorFetchingPackages', 'Error fetching packeges')}
-                  lowContrast
-                />
-              ) : (
-                <MultiSelect
-                  ref={field.ref}
-                  invalid={!!form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
-                  id="packages"
-                  titleText={t('package', 'Packages')}
-                  onChange={(e) => {
-                    field.onChange(e.selectedItems);
-                  }}
-                  selectedItems={field.value}
-                  label={t('choosePackage', 'Choose package')}
-                  items={packages.map((r) => r.uuid)}
-                  itemToString={(item) => {
-                    const _package = packages.find((r) => r.uuid === item);
-                    if (!_package) {
-                      return '';
-                    }
-                    return `${_package.packageCode}-${_package.packageName}`;
-                  }}
-                />
-              )}
-            </>
-          )}
+          render={({ field }) => {
+            return (
+              <MultiSelect
+                ref={field.ref}
+                invalid={!!form.formState.errors[field.name]?.message}
+                invalidText={form.formState.errors[field.name]?.message}
+                id="packages"
+                titleText={t('package', 'Packages')}
+                onChange={(e) => {
+                  field.onChange(e.selectedItems);
+                }}
+                selectedItems={field.value}
+                label={t('choosePackage', 'Choose package')}
+                items={packages.map((r) => r.uuid)}
+                itemToString={(item) => {
+                  const _package = packages.find((r) => r.uuid === item);
+                  if (!_package) {
+                    return '';
+                  }
+                  const displayName = `${_package.packageCode}-${_package.packageName}`;
+                  return displayName;
+                }}
+              />
+            );
+          }}
         />
       </Column>
       <Column>
         <PackageInterventions
           categories={
             packages
-              .filter((packages_) => selectedPackageObservable.includes(packages_.uuid))
-              ?.map((p) => p.packageCode) ?? []
+              .filter((packages_) => {
+                const isSelected = selectedPackageObservable.includes(packages_.uuid);
+                return isSelected;
+              })
+              ?.map((p) => {
+                return p.packageCode;
+              }) ?? []
           }
           patientUuid={patientUuid}
         />
@@ -102,4 +114,4 @@ const SHABenefitPackangesAndInterventions: React.FC<Props> = ({ patientUuid }) =
   );
 };
 
-export default SHABenefitPackangesAndInterventions;
+export default SHABenefitPackagesAndInterventions;

package/src/hooks/useInterventions.ts

@@ -1,173 +1,50 @@
 import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { useMemo } from 'react';
 import useSWR from 'swr';
-import useFacilityLevel from './useFacilityLevel';
-import { SHAIntervention } from '../types';
 
-export type InterventionsFilter = {
+export interface InterventionsFilter {
   package_code?: string;
-  scheme_code?: string;
   applicable_gender?: 'MALE' | 'FEMALE';
-};
+}
 
 interface Intervention {
-  id: number;
-  isMultisession: boolean;
-  fund: string;
-  supportedScheme: string;
-  parentBenefitName: string;
-  parentBenefitCode: string;
-  benefitCode: string;
-  benefitName: string;
-  guid: string;
-  created: string;
-  updated: string;
-  replicated: string;
-  owner: number;
-  needsPreauth: boolean;
-  levelsApplicable: string[];
-  paymentMechanism: string;
-  coverageLevel: string;
-  annualQuantityLimit: number;
-  annualQuantityLimitChoice: string;
-  annualQuantityLimitType: string;
-  overallTariff: string;
-  overallTariffHasLimit: boolean;
-  annualLimitValue: string;
-  usageFrequencyLimit: string;
-  usageFrequencyType: string;
-  status: string;
-  needsManualPreauthApproval: boolean;
-  needsDoctorAuthorization: boolean;
-  numberOfDoctorsRequired: string;
-  needsMemberAuthorization: boolean;
-  accessPoint: string;
-  name: string;
-  code: string;
-  active: boolean;
-  activeForUhc: boolean;
-  diagnosisBlock: string[];
-  diagnosisList: string[];
-  applicableGender: string;
-  applicableFacilityOwnership: string;
-  upperAgeLimit: string;
-  lowerAgeLimit: string;
-  investigationTariff: string;
-  investigationTariffHasLimit: boolean;
-  managementTariff: string;
-  managementTariffHasLimit: boolean;
-  isIntraMetro: boolean;
-  tariffPerAdditionalKilometer: string;
-  needApprovalBeforeClaimSubmission: boolean;
-  needsProtocols: boolean;
-  level_2_tariff: string;
-  level_3_tariff: string;
-  level_4_tariff: string;
-  level_5_tariff: string;
-  level_6_tariff: string;
-  protocolUsed: string;
-  tariffLimitPerIndividual: string;
-  complexity: string;
-  comment: string;
-  retiredOn: string;
-  requiresSurgicalPreauth: boolean;
-  requiresRenalPreauth: boolean;
-  requiresOncologyPreauth: boolean;
-  requiresRadiologyPreauth: boolean;
-  requiresOpticalPreauth: boolean;
-  applicableSchemes: string[];
-  benefit: number;
+  interventionCode: string;
+  interventionName: string;
+  interventionPackage: string;
+  interventionSubPackage: string;
+  interventionDescription?: string;
+  insuranceSchemes?: string;
 }
 
 /**
- * Hook to fetch and filter interventions based on provided filters
- * @param filters Object containing filtering criteria
- * @returns Object with loading state, filtered interventions, all interventions, and any errors
+ * Hook that returns a list of interventions based on filters
+ * @param filters - Filters for interventions (package_code, applicable_gender)
+ * @returns
  */
-export const useInterventions = (filters: InterventionsFilter) => {
-  const { error: facilityLevelError, isLoading: isLoadingFacilityLevel, level } = useFacilityLevel();
-
-  // Build URL parameters for the API call
-  const urlParams = new URLSearchParams({
-    ...(filters || {}),
-    synchronize: 'false',
-  });
-
-  const url = `${restBaseUrl}/kenyaemr/sha-interventions?${urlParams.toString()}`;
-  const { isLoading, error, data } = useSWR<FetchResponse<{ results: Array<Intervention> }>>(url, openmrsFetch);
-
-  // Mapper function to transform intervention data
-  const mapper = ({ code, name, parentBenefitCode }: Intervention): SHAIntervention => ({
-    interventionCode: code,
-    interventionName: name,
-    interventionPackage: parentBenefitCode,
-    ...({} as any),
-  });
-
-  // Filter and map interventions
-  const interventions = useMemo(() => {
-    if (!data?.data?.results) {
-      return [];
-    }
-
-    const packageCodes = filters.package_code?.split(',').filter(Boolean) || [];
-
-    const filteredResults = data.data.results.filter((intervention, i) => {
-      // Filter by package code (only if defined)
-
-      if (packageCodes.length > 0 && !packageCodes.includes(intervention.parentBenefitCode)) {
-        return false;
-      }
-
-      // Filter by applicable gender (only if defined)
-      if (
-        filters.applicable_gender &&
-        intervention.applicableGender &&
-        !['ALL', filters.applicable_gender].includes(intervention.applicableGender)
-      ) {
-        return false;
-      }
-
-      // // Filter by facility level
-      if (level && intervention.levelsApplicable && Array.isArray(intervention.levelsApplicable)) {
-        // Check if level starts with any of the intervention.levelsApplicable values
-        const levelMatched = intervention.levelsApplicable.some((appLevel) => level.startsWith(appLevel));
-
-        if (!levelMatched) {
-          return false;
-        }
-      }
-
-      return true; // Keep item if it passes all filters
-    });
+export const useInterventions = (filters?: InterventionsFilter) => {
+  const params = new URLSearchParams();
 
-    // Map to the required format and ensure uniqueness by interventionCode
-    const mappedInterventions = filteredResults.map(mapper);
+  if (filters?.package_code) {
+    params.append('package_code', filters.package_code);
+  }
 
-    return mappedInterventions;
-  }, [data, filters, level]);
+  if (filters?.applicable_gender) {
+    params.append('applicable_gender', filters.applicable_gender.toLowerCase());
+  }
 
-  // Map all interventions without filtering
-  const allInterventions = useMemo(() => {
-    if (!data?.data?.results) {
-      return [];
-    }
+  const url = `${restBaseUrl}/insclaims/interventions?${params.toString()}`;
 
-    // Map to the required format and ensure uniqueness
-    const mappedInterventions = data.data.results.map(mapper);
+  const allInterventionsUrl = `${restBaseUrl}/insclaims/interventions`;
 
-    // Remove duplicates based on interventionCode
-    const uniqueInterventions = Array.from(
-      new Map(mappedInterventions.map((item) => [item.interventionCode, item])),
-    ).map(([, value]) => value);
+  const { data, isLoading, error } = useSWR<FetchResponse<{ data: Array<Intervention> }>>(url, openmrsFetch);
 
-    return uniqueInterventions;
-  }, [data]);
+  const { data: allData } = useSWR<FetchResponse<{ data: Array<Intervention> }>>(allInterventionsUrl, openmrsFetch);
 
+  const interventions = data?.data?.data ?? [];
+  const allInterventions = allData?.data?.data ?? [];
   return {
-    isLoading: isLoading || isLoadingFacilityLevel,
-    interventions: interventions as Array<SHAIntervention>,
-    allInterventions: allInterventions as Array<SHAIntervention>,
-    error: error || facilityLevelError,
+    isLoading,
+    interventions,
+    allInterventions,
+    error,
   };
 };

package/src/hooks/usePackages.ts

@@ -2,27 +2,40 @@ import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework
 import useSWR from 'swr';
 import { Package } from '../types';
 
+interface PackagesFilter {
+  applicable_gender?: 'male' | 'female';
+}
+
 /**
- * Hook that return a list of sha benefits category/packages
+ * Hook that returns a list of SHA benefits category/packages
+ * @param filters - Optional filters for packages
  * @returns
  */
-const usePackages = () => {
-  const url = `${restBaseUrl}/kenyaemr/sha-benefits-package?synchronize=false`;
+const usePackages = (filters?: PackagesFilter) => {
+  const params = new URLSearchParams();
+
+  if (filters?.applicable_gender) {
+    params.append('applicable_gender', filters.applicable_gender);
+  }
+
+  const url = `${restBaseUrl}/insclaims/packages?${params.toString()}`;
 
-  const { data, isLoading, error } = useSWR<
-    FetchResponse<{ result: Array<{ benefitCode: string; benefitName: string; description?: string }> }>
-  >(url, openmrsFetch);
+  const { data, isLoading, error } = useSWR<FetchResponse<Array<{ code: string; name: string; description?: string }>>>(
+    url,
+    openmrsFetch,
+  );
 
+  const packages = (data?.data ?? []).map((category) => {
+    const pkg = {
+      uuid: `${category.code}`,
+      packageCode: category.code,
+      packageName: category.name,
+    } as Package;
+    return pkg;
+  });
   return {
     isLoading,
-    packages: (data?.data.result ?? []).map(
-      (category) =>
-        ({
-          uuid: `${category.benefitCode}`,
-          packageCode: category.benefitCode,
-          packageName: category.benefitName,
-        } as Package),
-    ),
+    packages,
     error,
   };
 };

package/translations/am.json

@@ -130,8 +130,8 @@
   "error": "ስህተት",
   "errored": "ስህተት ተፈጥሯል",
   "errorEndingVisit": "ጉብኝት በመጨረስ ላይ ስህተት",
-  "errorFetchingPackages": "ጥቅሎችን በማምጣት ላይ ስህተት",
   "errorLoadingBillServices": "የሂሳብ አገልግሎቶችን በመጫን ላይ ስህተት",
+  "errorLoadingData": "Error loading data",
   "errorLoadingpackages": "ጥቅሎችን በመጫን ላይ ስህተት",
   "errorLoadingPaymentModes": "የክፍያ ዘዴዎች ስህተት",
   "errorLoadingPaymentPoints": "የክፍያ ነጥቦችን በመጫን ላይ ስህተት",

package/translations/en.json

@@ -130,8 +130,8 @@
   "error": "Error",
   "errored": "Errored",
   "errorEndingVisit": "Error ending visit",
-  "errorFetchingPackages": "Error fetching packeges",
   "errorLoadingBillServices": "Error loading bill services",
+  "errorLoadingData": "Error loading data",
   "errorLoadingpackages": "Error loading packages",
   "errorLoadingPaymentModes": "Payment modes error",
   "errorLoadingPaymentPoints": "Error loading payment points",

package/translations/sw.json

@@ -130,8 +130,8 @@
   "error": "Error",
   "errored": "Errored",
   "errorEndingVisit": "Error ending visit",
-  "errorFetchingPackages": "Error fetching packeges",
   "errorLoadingBillServices": "Error loading bill services",
+  "errorLoadingData": "Error loading data",
   "errorLoadingpackages": "Error loading packages",
   "errorLoadingPaymentModes": "Payment modes error",
   "errorLoadingPaymentPoints": "Error loading payment points",