@kenyaemr/esm-billing-app 5.4.1-pre.1935 → 5.4.1-pre.1941

package/src/billable-services/billiable-item/order-actions/hooks/useMedicationOrderAction.ts

@@ -0,0 +1,106 @@
+import { useTranslation } from 'react-i18next';
+import { useStockItemQuantity } from '../../useBillableItem';
+import { useBillableServices } from '../../../billable-service.resource';
+
+import { useBillStatus } from './useBillStatus';
+import { createMedicationDispenseProps } from '../../test-order/dispense.resource';
+
+interface MedicationRequest {
+  request: fhir.MedicationRequest;
+}
+
+export function useMedicationOrderAction(medicationRequestBundle?: MedicationRequest) {
+  const { t } = useTranslation();
+  const request = medicationRequestBundle?.request;
+  const orderUuid = request?.id;
+  const patientUuid = request?.subject?.reference?.split('/')[1];
+  const drugUuid = request?.medicationReference?.reference?.split('/')[1];
+
+  const { isLoading, hasPendingPayment, itemHasBill } = useBillStatus(orderUuid, patientUuid);
+  const { stockItemQuantity, stockItemUuid } = useStockItemQuantity(drugUuid);
+  const { billableServices } = useBillableServices();
+
+  const billableItem =
+    billableServices?.filter((service) => {
+      const stockItem = service?.stockItem.split(':')[0];
+      return stockItem === stockItemUuid;
+    }) || [];
+
+  const dispenseFormProps = medicationRequestBundle ? createMedicationDispenseProps({ medicationRequestBundle }) : null;
+
+  const shouldShowBillModal = stockItemQuantity > 0 && itemHasBill.length < 1 && billableItem.length > 0;
+  const isDisabled = hasPendingPayment || (stockItemQuantity < 1 && !!drugUuid);
+
+  // Modification is allowed only when:
+  // 1. There are no pending payments
+  // 2. Stock item is available (quantity > 0)
+  // 3. Item hasn't been billed yet (no existing bills)
+  // 4. Item exists in billable items list
+  const shouldAllowModify =
+    !hasPendingPayment && stockItemQuantity > 0 && itemHasBill.length < 1 && billableItem.length > 0;
+
+  const getButtonText = () => {
+    if (hasPendingPayment) {
+      return t('unsettledBill', 'Unsettled bill');
+    }
+
+    if (stockItemQuantity < 1 && drugUuid) {
+      return t('outOfStock', 'Out of Stock');
+    }
+
+    if (shouldShowBillModal) {
+      return t('bill', 'Bill');
+    }
+
+    return t('dispense', 'Dispense');
+  };
+
+  return {
+    isLoading,
+    isDisabled,
+    buttonText: getButtonText(),
+    shouldShowBillModal,
+    dispenseFormProps,
+    orderUuid,
+    patientUuid,
+    billableItem,
+    itemHasBill,
+    medicationRequestBundle,
+    hasPendingPayment,
+    shouldAllowModify,
+  };
+}
+
+import { useMemo } from 'react';
+import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { Order } from '@openmrs/esm-patient-common-lib';
+import useSWR from 'swr';
+
+const customRepresentation =
+  'custom:(uuid,dosingType,orderNumber,accessionNumber,' +
+  'patient:ref,action,careSetting:ref,previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,' +
+  'orderType:ref,encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,orderType,urgency,instructions,' +
+  'commentToFulfiller,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),dose,doseUnits:ref,' +
+  'frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,' +
+  'duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)';
+
+/**
+ * Hook to get a single order by UUID.
+ *
+ * @param orderUuid The UUID of the order to fetch.
+ */
+export function useOrderByUuid(orderUuid: string) {
+  const ordersUrl = useMemo(
+    () => (orderUuid ? `${restBaseUrl}/order/${orderUuid}?v=${customRepresentation}` : null),
+    [orderUuid],
+  );
+  const { data, error, isLoading, isValidating, mutate } = useSWR<FetchResponse<Order>, Error>(ordersUrl, openmrsFetch);
+
+  return {
+    data: data?.data,
+    error,
+    isLoading,
+    isValidating,
+    mutate,
+  };
+}

package/src/billable-services/billiable-item/order-actions/hooks/useModalHandler.ts

@@ -0,0 +1,66 @@
+import { launchWorkspace } from '@openmrs/esm-framework';
+import { Order } from '@openmrs/esm-patient-common-lib';
+import { useCallback } from 'react';
+import { mutate } from 'swr';
+
+export function useModalHandler(mutateUrl?: string) {
+  const handleModalClose = useCallback(() => {
+    if (!mutateUrl) {
+      return;
+    }
+
+    mutate((key) => typeof key === 'string' && key.startsWith(mutateUrl), undefined, {
+      revalidate: true,
+    });
+  }, [mutateUrl]);
+
+  return {
+    handleModalClose,
+  };
+}
+
+export const launchPrescriptionEditWorkspace = (order: Order, patientUuid: string) => {
+  const newItem = {
+    uuid: order.uuid,
+    display: order.drug?.display,
+    previousOrder: order.uuid,
+    startDate: new Date(),
+    action: 'REVISE',
+    drug: order.drug,
+    dosage: order.dose,
+    unit: {
+      value: order.doseUnits?.display,
+      valueCoded: order.doseUnits?.uuid,
+    },
+    frequency: {
+      valueCoded: order.frequency?.uuid,
+      value: order.frequency?.display,
+    },
+    route: {
+      valueCoded: order.route?.uuid,
+      value: order.route?.display,
+    },
+    commonMedicationName: order.drug?.display,
+    isFreeTextDosage: order.dosingType === 'org.openmrs.FreeTextDosingInstructions',
+    freeTextDosage: order.dosingType === 'org.openmrs.FreeTextDosingInstructions' ? order.dosingInstructions : '',
+    patientInstructions: order.dosingType !== 'org.openmrs.FreeTextDosingInstructions' ? order.dosingInstructions : '',
+    asNeeded: order.asNeeded,
+    asNeededCondition: order.asNeededCondition,
+    duration: order.duration,
+    durationUnit: {
+      valueCoded: order.durationUnits?.uuid,
+      value: order.durationUnits?.display,
+    },
+    pillsDispensed: order.quantity,
+    numRefills: order.numRefills,
+    indication: order.orderReasonNonCoded,
+    orderer: order.orderer?.uuid,
+    careSetting: order.careSetting?.uuid,
+    quantityUnits: {
+      value: order.quantityUnits?.display,
+      valueCoded: order.quantityUnits?.uuid,
+    },
+  };
+
+  launchWorkspace('add-drug-order', { patientUuid, order: newItem });
+};

package/src/billing-form/billing-checkin-form.component.tsx

@@ -6,13 +6,14 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { createPatientBill, useBillableItems, useCashPoint } from '../billing.resource';
 import { BillingConfig } from '../config-schema';
-import { EXEMPTED_PAYMENT_STATUS, PENDING_PAYMENT_STATUS } from '../constants';
+import { EXEMPTED_PAYMENT_STATUS, PENDING_PAYMENT_STATUS, SHA_INSURANCE_SCHEME } from '../constants';
 import { BillingService } from '../types';
 import styles from './billing-checkin-form.scss';
 import { visitAttributesFormSchema, VisitAttributesFormValue } from './check-in-form.utils';
 import { hasPatientBeenExempted } from './helper';
 import SHANumberValidity from './social-health-authority/sha-number-validity.component';
 import VisitAttributesForm from './visit-attributes/visit-attributes-form.component';
+import SHABenefitPackangesAndInterventions from '../benefits-package/forms/packages-and-interventions-form.component';
 
 type BillingCheckInFormProps = {
   patientUuid: string;
@@ -36,11 +37,14 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
       insuranceScheme: '',
       policyNumber: '',
       exemptionCategory: '',
+      interventions: [],
+      packages: [],
     },
     resolver: zodResolver(visitAttributesFormSchema),
   });
   const isPatientExemptedValue = formMethods.watch('isPatientExempted');
   const paymentMethod = formMethods.watch('paymentMethods');
+  const isInsuranceSchemeSha = formMethods.watch('insuranceScheme') === SHA_INSURANCE_SCHEME;
 
   const handleCreateBill = useCallback((createBillPayload) => {
     createPatientBill(createBillPayload).then(
@@ -125,6 +129,7 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
     <FormProvider {...formMethods}>
       <VisitAttributesForm setAttributes={setAttributes} />
       {hieFeatureFlags && <SHANumberValidity paymentMethod={attributes} patientUuid={patientUuid} />}
+      {hieFeatureFlags && isInsuranceSchemeSha && <SHABenefitPackangesAndInterventions patientUuid={patientUuid} />}
       {paymentMethod && (
         <section className={styles.sectionContainer}>
           <div className={styles.sectionTitle}>{t('billing', 'Billing')}</div>

package/src/billing-form/check-in-form.utils.tsx

@@ -6,6 +6,8 @@ export const visitAttributesFormSchema = z.object({
   insuranceScheme: z.string().optional(),
   policyNumber: z.string().optional(),
   exemptionCategory: z.string().optional(),
+  packages: z.array(z.string()).nonempty('Require atleast 1 package'),
+  interventions: z.array(z.string()).nonempty('Require atleast 1 intervention'),
 });
 
 export type VisitAttributesFormValue = z.infer<typeof visitAttributesFormSchema>;

package/src/billing-form/visit-attributes/visit-attributes-form.component.tsx

@@ -16,7 +16,7 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
   const { t } = useTranslation();
   const { insuranceSchemes } = useConfig<BillingConfig>();
   const { visitAttributeTypes, patientExemptionCategories, insurancePaymentMethod } = useConfig<BillingConfig>();
-  const { setValue, watch, control, getValues } = useFormContext<VisitAttributesFormValue>();
+  const { setValue, watch, control, getValues, resetField } = useFormContext<VisitAttributesFormValue>();
   const { paymentModes, isLoading: isLoadingPaymentModes } = usePaymentModes();
   const [isPatientExempted, paymentMethods] = watch(['isPatientExempted', 'paymentMethods']);
   const resetFormFieldsForNonExemptedPatients = useCallback(() => {
@@ -24,7 +24,9 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
     setValue('policyNumber', '');
     setValue('exemptionCategory', '');
     setValue('paymentMethods', '');
-  }, [setValue]);
+    resetField('packages');
+    resetField('interventions');
+  }, [setValue, resetField]);
 
   useEffect(() => {
     resetFormFieldsForNonExemptedPatients();
@@ -38,6 +40,10 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
       { uuid: visitAttributeTypes.policyNumber, value: values.policyNumber },
       { uuid: visitAttributeTypes.insuranceScheme, value: values.insuranceScheme },
       { uuid: visitAttributeTypes.exemptionCategory, value: values.exemptionCategory },
+      {
+        uuid: visitAttributeTypes.shaBenefitPackagesAndInterventions,
+        value: JSON.stringify({ packages: values.packages, interventions: values.interventions }),
+      },
     ];
     const visitAttributesPayload = formPayload.filter(
       (item) => item.value !== undefined && item.value !== null && item.value !== '',
@@ -48,10 +54,12 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
     }));
   }, [visitAttributeTypes, getValues]);
 
-  const [policyNumber, exemptionCategory, insuranceScheme] = watch([
+  const [policyNumber, exemptionCategory, insuranceScheme, interventions, packages] = watch([
     'policyNumber',
     'exemptionCategory',
     'insuranceScheme',
+    'interventions',
+    'packages',
   ]);
 
   useEffect(() => {
@@ -64,6 +72,8 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
     policyNumber,
     exemptionCategory,
     insuranceScheme,
+    interventions,
+    packages,
   ]);
 
   if (isLoadingPaymentModes) {

package/src/claims/dashboard/form/claims-form.component.tsx

@@ -15,21 +15,21 @@ import {
   TextInputSkeleton,
 } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { navigate, showSnackbar, useSession } from '@openmrs/esm-framework';
-import React, { useEffect, useState } from 'react';
+import { navigate, showSnackbar, useConfig, useSession } from '@openmrs/esm-framework';
+import React, { useEffect, useMemo, useState } from 'react';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { z } from 'zod';
-import PackageInterventions from '../../../benefits-package/forms/package-interventions.component';
+import { BillingConfig } from '../../../config-schema';
 import { formatDate } from '../../../helpers/functions';
 import { useSystemSetting } from '../../../hooks/getMflCode';
-import usePackages from '../../../hooks/usePackages';
 import usePatientDiagnosis from '../../../hooks/usePatientDiagnosis';
+import useProvider from '../../../hooks/useProvider';
 import { LineItem, MappedBill } from '../../../types';
-import { processClaims, useVisit } from './claims-form.resource';
+import { processClaims, SHAPackagesAndInterventionVisitAttribute, useVisit } from './claims-form.resource';
 import styles from './claims-form.scss';
-import useProvider from '../../../hooks/useProvider';
+import SHABenefitPackangesAndInterventions from '../../../benefits-package/forms/packages-and-interventions-form.component';
 
 type ClaimsFormProps = {
   bill: MappedBill;
@@ -44,7 +44,7 @@ const ClaimsFormSchema = z.object({
   facility: z.string().nonempty({ message: 'Facility is required' }),
   treatmentStart: z.string().nonempty({ message: 'Treatment start date is required' }),
   treatmentEnd: z.string().nonempty({ message: 'Treatment end date is required' }),
-  package: z.string().min(1, 'Package Required'),
+  packages: z.array(z.string()).nonempty({ message: 'At least one package is required' }),
   interventions: z.array(z.string()).min(1, {
     message: 'At least one intervention is required',
   }),
@@ -57,11 +57,23 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
   const { patientUuid, billUuid } = useParams();
   const { visits: recentVisit, error: visitError, isLoading: visitLoading } = useVisit(patientUuid);
   const { diagnoses, error: diagnosisError, isLoading: diagnosisLoading } = usePatientDiagnosis(patientUuid);
-  const { error: packagesError, isLoading: packagesLoading, packages } = usePackages();
   const {
     currentProvider: { uuid: providerUuid },
   } = useSession();
   const { providerLoading: providerLoading, provider, error: providerError } = useProvider(providerUuid);
+  const { visitAttributeTypes } = useConfig<BillingConfig>();
+  const packagesAndinterventions = useMemo(() => {
+    if (recentVisit) {
+      const values = recentVisit.attributes?.find(
+        (attr) => attr.attributeType.uuid === visitAttributeTypes.shaBenefitPackagesAndInterventions,
+      )?.value;
+      if (values) {
+        const payload: SHAPackagesAndInterventionVisitAttribute = JSON.parse(values);
+        return payload;
+      }
+    }
+    return null;
+  }, [recentVisit, visitAttributeTypes]);
 
   const encounterUuid = recentVisit?.encounters[0]?.uuid;
   const visitTypeUuid = recentVisit?.visitType.uuid;
@@ -85,7 +97,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
       facility: `${recentVisit?.location?.display || ''} - ${mflCodeValue || ''}`,
       treatmentStart: recentVisit?.startDatetime ? formatDate(recentVisit.startDatetime) : '',
       treatmentEnd: recentVisit?.stopDatetime ? formatDate(recentVisit.stopDatetime) : '',
-      package: '',
+      packages: [],
       interventions: [],
       provider: providerUuid,
     },
@@ -99,11 +111,6 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
     reset,
   } = form;
 
-  const handleInterventionsChange = (e: { selectedItem: string }) => {
-    form.setValue('interventions', []);
-    setValue('package', e.selectedItem);
-  };
-
   const onSubmit = async (data: z.infer<typeof ClaimsFormSchema>) => {
     setLoading(true);
     const providedItems = selectedLineItems.reduce((acc, item) => {
@@ -139,7 +146,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
       use: 'claim',
       insurer: 'SHA',
       billNumber: billUuid,
-      packages: [data.package],
+      packages: data.packages,
       interventions: data.interventions,
     };
     try {
@@ -170,7 +177,6 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
       setLoading(false);
     }
   };
-  const selectedPackage = packages.find((package_) => package_.uuid === form.watch('package'))?.packageCode ?? '';
 
   useEffect(() => {
     setValue('diagnoses', diagnoses?.map((d) => d.id) ?? ([] as any));
@@ -178,9 +184,11 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
     setValue('facility', `${recentVisit?.location?.display || ''} - ${mflCodeValue || ''}`);
     setValue('treatmentStart', recentVisit?.startDatetime ? formatDate(recentVisit.startDatetime) : '');
     setValue('treatmentEnd', recentVisit?.stopDatetime ? formatDate(recentVisit.stopDatetime) : '');
-  }, [diagnoses, recentVisit, mflCodeValue, setValue, provider]);
+    setValue('packages', (packagesAndinterventions?.packages ?? []) as any);
+    setValue('interventions', (packagesAndinterventions?.interventions ?? []) as any);
+  }, [diagnoses, recentVisit, mflCodeValue, setValue, provider, packagesAndinterventions]);
 
-  if (visitLoading || diagnosisLoading || packagesLoading || providerLoading) {
+  if (visitLoading || diagnosisLoading || providerLoading) {
     return (
       <Layer className={styles.loading}>
         {Array.from({ length: 6 }).map((_, index) => (
@@ -190,7 +198,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
     );
   }
 
-  if (visitError || diagnosisError || packagesError || providerError) {
+  if (visitError || diagnosisError || providerError) {
     return (
       <Layer className={styles.loading}>
         <InlineNotification
@@ -198,7 +206,6 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
           subtitle={
             visitError?.message ??
             diagnosisError?.message ??
-            packagesError?.message ??
             providerError?.message ??
             'Error occured while loading claims form'
           }
@@ -284,45 +291,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
               </Layer>
             </Column>
           </Row>
-          <Column>
-            <Layer className={styles.input}>
-              <Controller
-                control={form.control}
-                name="package"
-                render={({ field }) => (
-                  <>
-                    {packagesError ? (
-                      <InlineNotification
-                        kind="error"
-                        subtitle={t('errorFetchingPackages', 'Error fetching packeges')}
-                        lowContrast
-                      />
-                    ) : (
-                      <Dropdown
-                        ref={field.ref}
-                        invalid={form.formState.errors[field.name]?.message}
-                        invalidText={form.formState.errors[field.name]?.message}
-                        id="package"
-                        titleText={t('package', 'Package')}
-                        onChange={handleInterventionsChange}
-                        initialSelectedItem={field.value}
-                        label="Choose package"
-                        items={packages.map((r) => r.uuid)}
-                        itemToString={(item) => packages.find((r) => r.uuid === item)?.packageName ?? ''}
-                      />
-                    )}
-                  </>
-                )}
-              />
-            </Layer>
-          </Column>
-
-          <Column>
-            <Layer className={styles.input}>
-              <PackageInterventions key={selectedPackage} category={selectedPackage} patientUuid={patientUuid} />
-            </Layer>
-          </Column>
-
+          <SHABenefitPackangesAndInterventions patientUuid={patientUuid} />
           <Column>
             <Layer className={styles.input}>
               <Controller

package/src/claims/dashboard/form/claims-form.resource.ts

@@ -13,11 +13,27 @@ interface ProvidersResponse {
   results: Provider[];
 }
 
+interface ExtendedVisit extends Visit {
+  attributes: Array<{
+    uuid: string;
+    display: string;
+    attributeType: {
+      uuid: string;
+      display: string;
+    };
+    value: string;
+  }>;
+}
+export interface SHAPackagesAndInterventionVisitAttribute {
+  packages: Array<string>;
+  interventions: Array<string>;
+}
+
 export function useVisit(patientUuid: string) {
   const customRepresentation =
-    'custom:(uuid,patient,encounters:(uuid,diagnoses:(uuid,display,certainty,diagnosis:(coded:(uuid,display))),encounterDatetime,encounterType:(uuid,display),encounterProviders:(uuid,display,provider:(uuid,person:(uuid,display)))),location:(uuid,name,display),visitType:(uuid,name,display),startDatetime,stopDatetime)&limit=1';
+    'custom:(uuid,patient,encounters:(uuid,diagnoses:(uuid,display,certainty,diagnosis:(coded:(uuid,display))),encounterDatetime,encounterType:(uuid,display),encounterProviders:(uuid,display,provider:(uuid,person:(uuid,display)))),location:(uuid,name,display),visitType:(uuid,name,display),startDatetime,stopDatetime,attributes)&limit=1';
 
-  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<Visit> } }, Error>(
+  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<ExtendedVisit> } }, Error>(
     `${restBaseUrl}/visit?patient=${patientUuid}&v=${customRepresentation}`,
     openmrsFetch,
   );

package/src/config-schema.ts

@@ -8,6 +8,7 @@ export interface BillingConfig {
     policyNumber: string;
     exemptionCategory: string;
     billPaymentStatus: string;
+    shaBenefitPackagesAndInterventions: string;
   };
   insurancePaymentMethod: string;
   inPatientVisitTypeUuid: string;
@@ -96,6 +97,11 @@ export const configSchema: ConfigSchema = {
       _description: 'The bill payment status visit attribute uuid',
       _default: '919b51c9-8e2e-468f-8354-181bf3e55786',
     },
+    shaBenefitPackagesAndInterventions: {
+      _type: Type.String,
+      _description: 'JSON String of SHA Benefit Packages and Interventions for this visit',
+      _default: '338725fa-3790-4679-98b9-be623214ee29',
+    },
   },
   insurancePaymentMethod: {
     _type: Type.String,

package/src/constants.ts

@@ -20,3 +20,4 @@ export const colorsArray = [
 // Size in MegaBits
 export const MAX_ALLOWED_FILE_SIZE = 2097152;
 export const PAYMENT_MODE_ATTRIBUTE_FORMATS = ['java.lang.String', 'java.lang.Integer', 'java.lang.Double'];
+export const SHA_INSURANCE_SCHEME = 'SHA';

package/src/hooks/useInterventions.ts

@@ -10,20 +10,6 @@ export type InterventionsFilter = {
   applicable_gender?: 'MALE' | 'FEMALE';
 };
 
-export const toQueryParams = (q: Record<string, any>) => {
-  return (
-    '?' +
-    Object.entries(q)
-      .reduce((prev, [key, val]) => {
-        if (val !== undefined && val !== null) {
-          return [...prev, `${key}=${val}`];
-        }
-        return prev;
-      }, [])
-      .join('&')
-  );
-};
-
 type Data = {
   status: string;
   data: Array<{
@@ -56,17 +42,18 @@ export const useInterventions = (filters: InterventionsFilter) => {
   };
 
   const { error: facilityLevelError, isLoading: isLoadingFacilityLevel, level } = useFacilityLevel();
-
-  const url = `${restBaseUrl}/kenyaemr/sha-interventions${toQueryParams({
+  const urlParams = new URLSearchParams({
     ...filters,
-    synchronize: false,
-  })}`;
+    synchronize: 'false',
+  });
+  const url = `${restBaseUrl}/kenyaemr/sha-interventions?${urlParams.toString()}`;
   const { isLoading, error, data } = useSWR<FetchResponse<Data>>(url, openmrsFetch);
   const interventions = useMemo(() => {
+    const packageCodes = filters.package_code?.split(',') || [];
     return data?.data?.data
       ?.filter((d) => {
         // 1. Filter by package code (only if defined)
-        if (filters.package_code && d.interventionPackage !== filters.package_code) {
+        if (packageCodes.length > 0 && !packageCodes.includes(d.interventionPackage)) {
           return false;
         }
 
@@ -106,12 +93,23 @@ export const useInterventions = (filters: InterventionsFilter) => {
         interventionCode,
         subCategoryBenefitsPackage: interventionSubPackage,
         interventionName,
+        interventionPackage,
       })) as SHAIntervention[];
   }, [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[];
+  }, [data]);
   return {
     isLoading: isLoading || isLoadingFacilityLevel,
-    interventions,
+    interventions: interventions ?? [],
+    allInterventions,
     error: error || facilityLevelError,
   };
 };

package/src/index.ts

@@ -23,7 +23,6 @@ import ImagingOrder from './billable-services/billiable-item/test-order/imaging-
 import LabOrder from './billable-services/billiable-item/test-order/lab-order.component';
 import PriceInfoOrder from './billable-services/billiable-item/test-order/price-info-order.componet';
 import ProcedureOrder from './billable-services/billiable-item/test-order/procedure-order.component';
-import TestOrderAction from './billable-services/billiable-item/test-order/test-order-action.component';
 import { BulkImportBillableServices } from './billable-services/bulk-import-billable-service.modal';
 import BillingCheckInForm from './billing-form/billing-checkin-form.component';
 import BillingForm from './billing-form/billing-form.component';
@@ -42,6 +41,7 @@ import { ClockIn } from './payment-points/payment-point/clock-in.modal';
 import { ClockOut } from './payment-points/payment-point/clock-out.modal';
 import RequirePaymentModal from './prompt-payment/prompt-payment-modal.component';
 import rootComponent from './root.component';
+import OrderActionButton from './billable-services/billiable-item/order-actions/components/order-action-button.component';
 
 const moduleName = '@kenyaemr/esm-billing-app';
 
@@ -169,7 +169,7 @@ export const priceInfoOrder = getSyncLifecycle(PriceInfoOrder, options);
 export const procedureOrder = getSyncLifecycle(ProcedureOrder, options);
 export const imagingOrder = getSyncLifecycle(ImagingOrder, options);
 export const drugOrder = getSyncLifecycle(DrugOrder, options);
-export const testOrderAction = getSyncLifecycle(TestOrderAction, options);
+export const orderActionButton = getSyncLifecycle(OrderActionButton, options);
 
 // bill manager modals
 export const deleteBillModal = getSyncLifecycle(DeleteBillModal, options);

package/src/routes.json

@@ -135,9 +135,9 @@
       "slot": "medication-info-slot"
     },
     {
-      "name": "billing-test-order-action",
-      "component": "testOrderAction",
-      "slot": "tests-ordered-actions-slot",
+      "name": "order-action-button",
+      "component": "orderActionButton",
+      "slot": "prescription-action-button-slot",
       "order": 0
     },
     {

package/src/types/index.ts

@@ -493,6 +493,7 @@ export type PaymentMode = {
 
 export type SHAIntervention = {
   interventionCode: string;
+  interventionPackage: string;
   shaCategory: string;
   accessCode: string;
   subCategoryBenefitsPackage: string;