@kenyaemr/esm-billing-app 5.4.1-pre.2061 → 5.4.1-pre.2073

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}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","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","slot":"patient-chart-dashboard-slot","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":"require-billing-modal","component":"requirePaymentModal"},{"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":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","order":0,"slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"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"}],"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":"bill-deposit-workspace","component":"billDepositWorkspace","title":"Bill Deposit 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":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"}],"version":"5.4.1-pre.2061"}
+{"$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}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","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","slot":"patient-chart-dashboard-slot","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":"require-billing-modal","component":"requirePaymentModal"},{"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":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","order":0,"slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"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"}],"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":"bill-deposit-workspace","component":"billDepositWorkspace","title":"Bill Deposit 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":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"}],"version":"5.4.1-pre.2073"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.1-pre.2061",
+  "version": "5.4.1-pre.2073",
   "description": "Billing app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-billing-app.js",
   "main": "src/index.ts",

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

@@ -80,7 +80,13 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ categories,
           selectedItems={field.value}
           label={t('chooseInterventions', 'Choose interventions')}
           items={interventions_.map((r) => r.interventionCode)}
-          itemToString={(item) => interventions_.find((r) => r.interventionCode === item)?.interventionName ?? ''}
+          itemToString={(item) => {
+            const _intervention = interventions_.find((r) => r.interventionCode === item);
+            if (!_intervention) {
+              return '';
+            }
+            return `${_intervention.interventionPackage}-${_intervention.interventionName}`;
+          }}
         />
       )}
     />

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

@@ -75,7 +75,13 @@ const SHABenefitPackangesAndInterventions: React.FC<Props> = ({ patientUuid }) =
                   selectedItems={field.value}
                   label={t('choosePackage', 'Choose package')}
                   items={packages.map((r) => r.uuid)}
-                  itemToString={(item) => packages.find((r) => r.uuid === item)?.packageName ?? ''}
+                  itemToString={(item) => {
+                    const _package = packages.find((r) => r.uuid === item);
+                    if (!_package) {
+                      return '';
+                    }
+                    return `${_package.packageCode}-${_package.packageName}`;
+                  }}
                 />
               )}
             </>

package/src/hooks/useInterventions.ts

@@ -1,8 +1,8 @@
 import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { useMemo } from 'react';
 import useSWR from 'swr';
-import { SHAIntervention } from '../types';
 import useFacilityLevel from './useFacilityLevel';
-import { useMemo } from 'react';
+import { SHAIntervention } from '../types';
 
 export type InterventionsFilter = {
   package_code?: string;
@@ -10,106 +10,123 @@ export type InterventionsFilter = {
   applicable_gender?: 'MALE' | 'FEMALE';
 };
 
-type Data = {
+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;
-  data: Array<{
-    interventionName: string;
-    interventionCode: string;
-    interventionPackage: string;
-    interventionSubPackage: string;
-    interventionDescription?: string;
-    insuranceSchemes: Array<{
-      rules: Array<{
-        ruleName: string;
-        ruleCode: string;
-        value: string;
-      }>;
-    }>;
-  }>;
-};
-export const useInterventions = (filters: InterventionsFilter) => {
-  const fetcher = (url: string) => {
-    return openmrsFetch(url, {
-      method: 'POST',
-      body: {
-        searchKeyAndValues: {
-          ...filters,
-          // scheme_code: 'UHC',
-          applicable_gender: filters.applicable_gender ? `ALL,${filters.applicable_gender}` : undefined,
-        },
-      },
-    });
-  };
+  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;
+}
 
+export const useInterventions = (filters: InterventionsFilter) => {
   const { error: facilityLevelError, isLoading: isLoadingFacilityLevel, level } = useFacilityLevel();
   const urlParams = new URLSearchParams({
     ...filters,
     synchronize: 'false',
   });
   const url = `${restBaseUrl}/kenyaemr/sha-interventions?${urlParams.toString()}`;
-  const { isLoading, error, data } = useSWR<FetchResponse<Data>>(url, openmrsFetch);
+  const { isLoading, error, data } = useSWR<FetchResponse<{ results: Array<Intervention> }>>(url, openmrsFetch);
+  const mapper = ({ benefitCode, benefitName, parentBenefitCode }: Intervention): any => ({
+    interventionCode: benefitCode,
+    interventionName: benefitName,
+    interventionPackage: parentBenefitCode,
+  });
+
   const interventions = useMemo(() => {
     const packageCodes = filters.package_code?.split(',') || [];
-    return data?.data?.data
+    return data?.data?.results
       ?.filter((d) => {
         // 1. Filter by package code (only if defined)
-        if (packageCodes.length > 0 && !packageCodes.includes(d.interventionPackage)) {
+        if (packageCodes.length > 0 && !packageCodes.includes(d.parentBenefitCode)) {
           return false;
         }
 
         // 2. Filter by applicable gender (only if defined)
         if (
           filters.applicable_gender &&
-          d.insuranceSchemes?.some((s) =>
-            s.rules?.some(
-              (r) =>
-                r.ruleCode === 'applicable_gender' &&
-                r.value && // Ensure value exists
-                !['ALL', filters.applicable_gender].includes(r.value),
-            ),
-          )
+          d.applicableGender &&
+          !['ALL', filters.applicable_gender].includes(d.applicableGender)
         ) {
           return false;
         }
 
-        // 3. Filter by levels applicable (only if level is defined)
-        if (
-          level &&
-          d.insuranceSchemes?.some((s) =>
-            s.rules?.some(
-              (r) =>
-                r.ruleCode === 'levels_applicable' &&
-                r.value && // Ensure value exists
-                !String(r.value).includes(level), // Convert to string to avoid array issues
-            ),
-          )
-        ) {
+        if (level && d.levelsApplicable && !d.levelsApplicable.some((l) => level.includes(l))) {
           return false;
         }
 
         return true; // Keep item if it passes all filters
       })
-      ?.map(({ interventionCode, interventionName, interventionPackage, interventionSubPackage }) => ({
-        interventionCode,
-        subCategoryBenefitsPackage: interventionSubPackage,
-        interventionName,
-        interventionPackage,
-      })) as SHAIntervention[];
+      ?.map(mapper);
   }, [data, filters, level]); // Ensure proper memoization
   const allInterventions = useMemo(() => {
-    return (data?.data?.data ?? []).map(
-      ({ interventionCode, interventionName, interventionPackage, interventionSubPackage }) => ({
-        interventionCode,
-        subCategoryBenefitsPackage: interventionSubPackage,
-        interventionName,
-        interventionPackage,
-      }),
-    ) as SHAIntervention[];
+    return (data?.data?.results ?? []).map(mapper);
   }, [data]);
+
   return {
     isLoading: isLoading || isLoadingFacilityLevel,
-    interventions: interventions ?? [],
-    allInterventions,
+    interventions: (interventions ?? []) as Array<SHAIntervention>,
+    allInterventions: (allInterventions ?? []) as Array<SHAIntervention>,
     error: error || facilityLevelError,
   };
 };

package/src/hooks/usePackages.ts

@@ -10,17 +10,17 @@ const usePackages = () => {
   const url = `${restBaseUrl}/kenyaemr/sha-benefits-package?synchronize=false`;
 
   const { data, isLoading, error } = useSWR<
-    FetchResponse<{ data: Array<{ code: string; name: string; description?: string }> }>
+    FetchResponse<{ result: Array<{ benefitCode: string; benefitName: string; description?: string }> }>
   >(url, openmrsFetch);
 
   return {
     isLoading,
-    packages: (data?.data.data ?? []).map(
+    packages: (data?.data.result ?? []).map(
       (category) =>
         ({
-          uuid: `${category.code}`,
-          packageCode: category.code,
-          packageName: category.name,
+          uuid: `${category.benefitCode}`,
+          packageCode: category.benefitCode,
+          packageName: category.benefitName,
         } as Package),
     ),
     error,