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

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":"billing-test-order-action","component":"testOrderAction","slot":"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":"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"}],"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.1935"}
+{"$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":"billing-test-order-action","component":"testOrderAction","slot":"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":"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"}],"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.1936"}

package/package.json

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

package/src/benefits-package/benefits-package.resources.tsx

@@ -16,7 +16,7 @@ export const preauthSchema = z.object({
   providerUuid: z.string().uuid(),
   facilityUuid: z.string().uuid(),
   diagnosisUuids: z.array(z.string()),
-  packageUUid: z.string(),
+  packages: z.array(z.string()).nonempty('Require atleast 1 package'),
   interventions: z.array(z.string()).nonempty('Require atleast 1 intervention'),
 });
 

package/src/benefits-package/forms/benefit-pre-auth-form.workspace.tsx

@@ -5,16 +5,15 @@ import {
   DropdownSkeleton,
   Form,
   FormLabel,
-  InlineNotification,
   Layer,
   Loading,
   MultiSelect,
   Stack,
-  Tile,
 } from '@carbon/react';
 import { DocumentAttachment } from '@carbon/react/icons';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { DefaultWorkspaceProps, showSnackbar, useSession } from '@openmrs/esm-framework';
+import { ErrorState } from '@openmrs/esm-patient-common-lib';
 import React, { useEffect, useRef, useState } from 'react';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -22,14 +21,12 @@ import { z } from 'zod';
 import { useVisit } from '../../claims/dashboard/form/claims-form.resource';
 import { MAX_ALLOWED_FILE_SIZE } from '../../constants';
 import { useSystemSetting } from '../../hooks/getMflCode';
-import usePackages from '../../hooks/usePackages';
 import usePatientDiagnosis from '../../hooks/usePatientDiagnosis';
 import useProvider from '../../hooks/useProvider';
 import { PatientBenefit } from '../../types';
 import { preAuthenticateBenefit, preauthSchema } from '../benefits-package.resources';
 import styles from './benefits-pre-auth-form.scss';
-import PackageInterventions from './package-interventions.component';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
+import SHABenefitPackangesAndInterventions from './packages-and-interventions-form.component';
 
 type BenefitsPreAuth = z.infer<typeof preauthSchema>;
 
@@ -41,7 +38,7 @@ interface BenefitPreAuthFormProps extends DefaultWorkspaceProps {
 
 const BenefitPreAuthForm: React.FC<BenefitPreAuthFormProps> = ({ closeWorkspace, patientUuid }) => {
   const { t } = useTranslation();
-  const { visits: recentVisit, isLoading } = useVisit(patientUuid);
+  const { visits: recentVisit, isLoading, error: visitError } = useVisit(patientUuid);
   const { isLoading: diagnosesLoading, diagnoses } = usePatientDiagnosis(patientUuid);
   const inputFileRef = useRef<HTMLInputElement>();
   const [uploadedFile, setUploadedFile] = useState<File | null>(null);
@@ -53,7 +50,6 @@ const BenefitPreAuthForm: React.FC<BenefitPreAuthFormProps> = ({ closeWorkspace,
     sessionLocation: { uuid: facilityUuid, display: facilityName },
   } = useSession();
   const { providerLoading: providerLoading, provider } = useProvider(providerUuid);
-  const { isLoading: packagesLoading, error: packageError, packages } = usePackages();
 
   const form = useForm<BenefitsPreAuth>({
     defaultValues: {
@@ -62,6 +58,7 @@ const BenefitPreAuthForm: React.FC<BenefitPreAuthFormProps> = ({ closeWorkspace,
       facilityUuid,
       diagnosisUuids: [],
       interventions: [],
+      packages: [],
     },
     resolver: zodResolver(preauthSchema),
   });
@@ -104,9 +101,7 @@ const BenefitPreAuthForm: React.FC<BenefitPreAuthFormProps> = ({ closeWorkspace,
     }
   };
 
-  const selectedPackageObservable = form.watch('packageUUid');
-
-  if (packagesLoading || diagnosesLoading || isLoading || providerLoading) {
+  if (diagnosesLoading || isLoading || providerLoading) {
     return (
       <Layer className={styles.loading}>
         <Loading withOverlay={false} small />
@@ -114,10 +109,10 @@ const BenefitPreAuthForm: React.FC<BenefitPreAuthFormProps> = ({ closeWorkspace,
     );
   }
 
-  if (packageError) {
+  if (visitError) {
     return (
       <Layer className={styles.error}>
-        <ErrorState error={packageError} headerTitle={t('errorMessage', 'Error')} />
+        <ErrorState error={visitError} headerTitle={t('errorMessage', 'Error')} />
       </Layer>
     );
   }
@@ -206,46 +201,7 @@ const BenefitPreAuthForm: React.FC<BenefitPreAuthFormProps> = ({ closeWorkspace,
               )}
             />
           </Column>
-          <Column>
-            <Controller
-              control={form.control}
-              name="packageUUid"
-              render={({ field }) => (
-                <>
-                  {packageError ? (
-                    <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={(e) => {
-                        field.onChange(e.selectedItem);
-                      }}
-                      initialSelectedItem={field.value}
-                      label="Choose package"
-                      items={packages.map((r) => r.uuid)}
-                      itemToString={(item) => packages.find((r) => r.uuid === item)?.packageName ?? ''}
-                    />
-                  )}
-                </>
-              )}
-            />
-          </Column>
-          {selectedPackageObservable && (
-            <Column>
-              <PackageInterventions
-                category={packages.find((package_) => package_.uuid === selectedPackageObservable)?.packageCode ?? ''}
-                patientUuid={patientUuid}
-              />
-            </Column>
-          )}
+          <SHABenefitPackangesAndInterventions patientUuid={patientUuid} />
           <Column>
             <Controller
               control={form.control}

package/src/benefits-package/forms/{package-interventions.component.tsx → interventions-form.component.tsx}

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { InlineLoading, InlineNotification, MultiSelect } from '@carbon/react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -10,19 +10,35 @@ import { usePatient } from '@openmrs/esm-framework';
 type EligibilityRequest = z.infer<typeof eligibilityRequestShema>;
 
 type PackageInterventionsProps = {
-  category: string;
+  categories: Array<string>;
   patientUuid: string;
 };
-const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, patientUuid }) => {
+const PackageInterventions: React.FC<PackageInterventionsProps> = ({ categories, patientUuid }) => {
   const { error: patientError, isLoading: isPatientLoading, patient } = usePatient(patientUuid);
   const filters: InterventionsFilter = {
-    package_code: category,
+    package_code: categories.join(','),
     applicable_gender: patient?.gender === 'male' ? 'MALE' : 'FEMALE',
   };
-  const { error, interventions, isLoading } = useInterventions(filters);
+  const { error, interventions, isLoading, allInterventions } = useInterventions(filters);
 
-  const form = useFormContext<EligibilityRequest>();
+  const form = useFormContext<{ packages: Array<string>; interventions: Array<string> }>();
   const { t } = useTranslation();
+  const selectedInterventionsObservable = form.watch('interventions');
+
+  const interventions_ = useMemo(() => {
+    const additionalInterventions = selectedInterventionsObservable.reduce((prev, curr) => {
+      const interventionContainedInOptions = interventions.some((i) => i.interventionCode === curr);
+      if (!interventionContainedInOptions) {
+        const intervention = allInterventions.find((i) => i.interventionCode === curr);
+        if (intervention) {
+          prev.push(intervention);
+        }
+      }
+      return prev;
+    }, [] as typeof allInterventions);
+
+    return [...interventions, ...additionalInterventions];
+  }, [allInterventions, interventions, selectedInterventionsObservable]);
 
   if (isLoading || isPatientLoading) {
     return (
@@ -47,10 +63,6 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, p
     );
   }
 
-  if (interventions.length === 0) {
-    return null;
-  }
-
   return (
     <Controller
       control={form.control}
@@ -65,10 +77,10 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, p
           onChange={(e) => {
             field.onChange(e.selectedItems);
           }}
-          initialSelectedItems={field.value}
+          selectedItems={field.value}
           label={t('chooseInterventions', 'Choose interventions')}
-          items={interventions.map((r) => r.interventionCode)}
-          itemToString={(item) => interventions.find((r) => r.interventionCode === item)?.interventionName ?? ''}
+          items={interventions_.map((r) => r.interventionCode)}
+          itemToString={(item) => interventions_.find((r) => r.interventionCode === item)?.interventionName ?? ''}
         />
       )}
     />

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

@@ -0,0 +1,72 @@
+import { Column, InlineLoading, InlineNotification, MultiSelect } from '@carbon/react';
+import React, { useEffect } from 'react';
+import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import PackageInterventions from './interventions-form.component';
+import usePackages from '../../hooks/usePackages';
+
+type Props = {
+  patientUuid: string;
+};
+
+const SHABenefitPackangesAndInterventions: React.FC<Props> = ({ patientUuid }) => {
+  const form = useFormContext<{ packages: Array<string>; interventions: Array<string> }>();
+  const { isLoading: packagesLoading, error: packageError, packages } = usePackages();
+  const { t } = useTranslation();
+  const selectedPackageObservable = form.watch('packages');
+
+  if (packagesLoading) {
+    return (
+      <InlineLoading description={t('loading', 'Loading')} iconDescription={t('loading', 'Loading data') + '...'} />
+    );
+  }
+
+  return (
+    <>
+      <Column>
+        <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) => packages.find((r) => r.uuid === item)?.packageName ?? ''}
+                />
+              )}
+            </>
+          )}
+        />
+      </Column>
+      <Column>
+        <PackageInterventions
+          categories={
+            packages
+              .filter((packages_) => selectedPackageObservable.includes(packages_.uuid))
+              ?.map((p) => p.packageCode) ?? []
+          }
+          patientUuid={patientUuid}
+        />
+      </Column>
+    </>
+  );
+};
+
+export default SHABenefitPackangesAndInterventions;

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,
   );