@kenyaemr/esm-billing-app 5.4.1-pre.2009 → 5.4.1-pre.2014

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.2009"}
+{"$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.2014"}

package/package.json

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

package/src/billing-form/social-health-authority/sha-number-validity.component.tsx

@@ -27,6 +27,7 @@ const SHANumberValidity: React.FC<SHANumberValidityProps> = ({ paymentMethod, pa
   const { data, isLoading: isLoadingHIEEligibility, error } = useSHAEligibility(patientUuid, shaIdentificationNumber);
 
   const isRegisteredOnSHA = data?.status === 1;
+  const hasCrNumber = !!data?.memberCrNumber && data.memberCrNumber.length > 0;
 
   const isActive = isRegisteredOnSHA
     ? isWithinInterval(new Date(), {
@@ -75,7 +76,7 @@ const SHANumberValidity: React.FC<SHANumberValidityProps> = ({ paymentMethod, pa
     );
   }
 
-  if (!isRegisteredOnSHA) {
+  if (!hasCrNumber) {
     return (
       <InlineNotification
         title={t('hieVerificationFailure', 'HIE verification failure')}
@@ -85,33 +86,39 @@ const SHANumberValidity: React.FC<SHANumberValidityProps> = ({ paymentMethod, pa
     );
   }
 
-  if (isRegisteredOnSHA) {
-    return (
-      <Form className={styles.formContainer}>
-        <div className={styles.hieCard}>
-          <div className={isActive ? styles.hieCardItemActive : styles.hieCardItemInActive}>
-            <span className={styles.hieInsurerTitle}>{t('insurer', 'Insurer:')}</span>{' '}
-            <span className={styles.hieInsurerValue}>SHA</span>
-            {isActive && (
-              <Tooltip
-                className={styles.tooltip}
-                align="bottom"
-                label={`Active from ${formatDate(new Date(data?.coverageStartDate))}`}>
-                <button className="sb-tooltip-trigger" type="button">
-                  <Information />
-                </button>
-              </Tooltip>
-            )}
-          </div>
-          <div className={isActive ? styles.hieCardItemActive : styles.hieCardItemInActive}>
-            <CheckboxCheckedFilled />
-            <span className={isActive ? styles.activeSubscription : styles.inActiveSubscription}>
-              {isActive ? t('active', 'Active') : t('inactive', 'Inactive')}
-            </span>
-          </div>
+  const renderInsurerCard = (insurerValue: string, cardClass: string) => (
+    <Form className={styles.formContainer}>
+      <div className={cardClass}>
+        <div className={isActive ? styles.hieCardItemActive : styles.hieCardItemInActive}>
+          <span className={styles.hieInsurerTitle}>{t('insurer', 'Insurer:')}</span>{' '}
+          <span className={styles.hieInsurerValue}>{insurerValue}</span>
+          {isActive && (
+            <Tooltip
+              className={styles.tooltip}
+              align="bottom"
+              label={`Active from ${formatDate(new Date(data?.coverageStartDate))}`}>
+              <button className="sb-tooltip-trigger" type="button">
+                <Information />
+              </button>
+            </Tooltip>
+          )}
         </div>
-      </Form>
-    );
+        <div className={isActive ? styles.hieCardItemActive : styles.hieCardItemInActive}>
+          <CheckboxCheckedFilled />
+          <span className={isActive ? styles.activeSubscription : styles.inActiveSubscription}>
+            {isActive ? t('active', 'Active') : t('inactive', 'Inactive')}
+          </span>
+        </div>
+      </div>
+    </Form>
+  );
+
+  if (hasCrNumber) {
+    if (isRegisteredOnSHA) {
+      return renderInsurerCard('PHC | SHIF | ECCIF', styles.hieCard);
+    } else {
+      return renderInsurerCard('PHC', styles.hieCardPHC);
+    }
   }
 };
 

package/src/billing-form/social-health-authority/sha-number-validity.scss

@@ -8,6 +8,21 @@
 }
 
 .hieCard {
+  height: layout.$layout-03;
+  display: grid;
+  grid-template-columns: 4fr 1fr 1fr;
+  grid-row: auto;
+  align-items: center;
+  column-gap: layout.$spacing-03;
+  border-bottom: 1px solid colors.$cool-gray-20;
+
+  &:hover {
+    cursor: pointer;
+    background-color: colors.$cool-gray-10;
+  }
+}
+
+.hieCardPHC {
   height: layout.$layout-03;
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;

package/src/claims/dashboard/form/claims-explanation-and-justification-form-input.component.tsx

@@ -1,6 +1,6 @@
 import { Column, InlineLoading, InlineNotification, Layer, TextArea } from '@carbon/react';
 import { usePatient } from '@openmrs/esm-framework';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useCallback } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { InterventionsFilter, useInterventions } from '../../../hooks/useInterventions';
@@ -9,50 +9,110 @@ import styles from './claims-form.scss';
 
 type ClaimExplanationAndJusificationInputProps = {
   patientUuid: string;
+  disabled?: boolean;
+  validationEnabled?: boolean;
+  onInteraction?: () => void;
 };
-const ClaimExplanationAndJusificationInput: React.FC<ClaimExplanationAndJusificationInputProps> = ({ patientUuid }) => {
-  const { error: patientError, isLoading: isPatientLoading, patient } = usePatient(patientUuid);
 
-  const form = useFormContext<{
-    claimExplanation: string;
-    claimJustification: string;
-    packages: Array<string>;
-    interventions: Array<string>;
-  }>();
+const ClaimExplanationAndJusificationInput: React.FC<ClaimExplanationAndJusificationInputProps> = ({
+  patientUuid,
+  disabled = false,
+  validationEnabled = false,
+  onInteraction = () => {},
+}) => {
+  const { error: patientError, isLoading: isPatientLoading, patient } = usePatient(patientUuid);
   const { t } = useTranslation();
+  const form = useFormContext();
+  const { setValue, watch, trigger } = form;
+
+  const packages = watch('packages');
+  const interventions = watch('interventions');
+  const currentExplanation = watch('claimExplanation');
+  const currentJustification = watch('claimJustification');
+
   const { isLoading: packagesLoading, error: packageError, packages: shaPackages } = usePackages();
-  const { setValue } = form;
-  const packagesObservable = form.watch('packages');
-  const interventionsObservable = form.watch('interventions');
+
   const filters = useMemo<InterventionsFilter>(
     () => ({
-      package_code: packagesObservable.join(','),
+      package_code: packages?.join(','),
       applicable_gender: patient?.gender === 'male' ? 'MALE' : 'FEMALE',
     }),
-    [packagesObservable, patient],
+    [packages, patient?.gender],
   );
+
   const { error: interventionsError, isLoading: isLoadingInterventions, allInterventions } = useInterventions(filters);
+
   const packagesSelected = useMemo(
     () =>
-      packagesObservable
-        .map((packageCode) => shaPackages.find((pkg) => pkg.uuid === packageCode))
+      packages
+        ?.map((packageCode) => shaPackages.find((pkg) => pkg.uuid === packageCode))
         ?.map((p) => p?.packageName ?? '')
         .filter(Boolean) ?? [],
-    [packagesObservable, shaPackages],
+    [packages, shaPackages],
   );
+
   const interventionSelected = useMemo(
     () =>
-      interventionsObservable.map(
-        (interventionCode) =>
-          allInterventions.find((intervention) => intervention.interventionCode === interventionCode)?.interventionName,
-      ) ?? [],
-    [interventionsObservable, allInterventions],
+      interventions
+        ?.map(
+          (interventionCode) =>
+            allInterventions.find((intervention) => intervention.interventionCode === interventionCode)
+              ?.interventionName,
+        )
+        .filter(Boolean) ?? [],
+    [interventions, allInterventions],
   );
 
+  const hasPackagesAndInterventions = packagesSelected.length > 0 && interventionSelected.length > 0;
+
+  const updateFormFields = useCallback(() => {
+    if (!packagesLoading && !isLoadingInterventions && hasPackagesAndInterventions) {
+      const newExplanation = packagesSelected.join(', ');
+      const newJustification = interventionSelected.join(', ');
+
+      if (newExplanation !== currentExplanation) {
+        setValue('claimExplanation', newExplanation, {
+          shouldValidate: validationEnabled,
+          shouldDirty: true,
+          shouldTouch: false,
+        });
+      }
+
+      if (newJustification !== currentJustification) {
+        setValue('claimJustification', newJustification, {
+          shouldValidate: validationEnabled,
+          shouldDirty: true,
+          shouldTouch: false,
+        });
+      }
+
+      if (validationEnabled) {
+        trigger(['claimExplanation', 'claimJustification']);
+      }
+      onInteraction();
+    }
+  }, [
+    packagesLoading,
+    isLoadingInterventions,
+    hasPackagesAndInterventions,
+    packagesSelected,
+    interventionSelected,
+    currentExplanation,
+    currentJustification,
+    setValue,
+    validationEnabled,
+    trigger,
+    onInteraction,
+  ]);
+
   useEffect(() => {
-    setValue('claimExplanation', packagesSelected.join(', '));
-    setValue('claimJustification', interventionSelected.join(', '));
-  }, [packagesSelected, setValue, interventionSelected]);
+    const timer = setTimeout(updateFormFields, 300);
+    return () => clearTimeout(timer);
+  }, [updateFormFields]);
+
+  const shouldShowError = (fieldName: string) => {
+    return validationEnabled && form.formState.errors[fieldName] && form.formState.touchedFields[fieldName];
+  };
 
   if (packagesLoading || isPatientLoading || isLoadingInterventions) {
     return (
@@ -68,11 +128,13 @@ const ClaimExplanationAndJusificationInput: React.FC<ClaimExplanationAndJusifica
         lowContrast={true}
         statusIconDescription="notification"
         title={t('errorLoadingpackages', 'Error loading packages')}
-        subtitle={packageError?.message ?? packageError?.message ?? interventionsError?.message}
+        subtitle={packageError?.message ?? patientError?.message ?? interventionsError?.message}
       />
     );
   }
 
+  const textAreaDisabled = disabled && !hasPackagesAndInterventions;
+
   return (
     <>
       <Column>
@@ -87,8 +149,13 @@ const ClaimExplanationAndJusificationInput: React.FC<ClaimExplanationAndJusifica
                 rows={3}
                 placeholder="Claim Explanation"
                 id="claimExplanation"
-                invalid={!!error?.message}
+                invalid={shouldShowError('claimExplanation')}
                 invalidText={error?.message}
+                disabled={textAreaDisabled}
+                onChange={(e) => {
+                  field.onChange(e);
+                  onInteraction();
+                }}
               />
             )}
           />
@@ -106,8 +173,13 @@ const ClaimExplanationAndJusificationInput: React.FC<ClaimExplanationAndJusifica
                 rows={3}
                 placeholder="Claim Justification"
                 id="claimJustification"
-                invalid={!!error?.message}
+                invalid={shouldShowError('claimJustification')}
                 invalidText={error?.message}
+                disabled={textAreaDisabled}
+                onChange={(e) => {
+                  field.onChange(e);
+                  onInteraction();
+                }}
               />
             )}
           />
@@ -117,4 +189,4 @@ const ClaimExplanationAndJusificationInput: React.FC<ClaimExplanationAndJusifica
   );
 };
 
-export default ClaimExplanationAndJusificationInput;
+export default React.memo(ClaimExplanationAndJusificationInput);