Merge pull request #6193 from masslight/release/1.27

Release/1.27

Author: VladMstv

apps/ehr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ehr-ui",
-  "version": "1.26.14",
+  "version": "1.27.25",
   "private": true,
   "type": "module",
   "engines": {

apps/ehr/src/components/CancelVisitDialog.tsx

@@ -32,7 +32,7 @@ const CancelVisitDialog = ({ onClose }: CancelVisitDialogProps): ReactElement =>
   const { id: appointmentID } = useParams();
   const navigate = useNavigate();
 
-  const cancellationReasons = VALUE_SETS.cancelReasonOptionsVirtualProviderSide;
+  const cancellationReasons = VALUE_SETS.cancelReasonOptionsVirtualProvider;
 
   const handleReasonChange = (event: SelectChangeEvent<string>): void => {
     setReason(event.target.value);
@@ -64,7 +64,7 @@ const CancelVisitDialog = ({ onClose }: CancelVisitDialogProps): ReactElement =>
     try {
       const response = await cancelTelemedAppointment(oystehrZambda, {
         appointmentID: appointmentID || '',
-        cancellationReason: typedReason,
+        cancellationReason: typedReason.value,
         cancellationReasonAdditional: otherReason,
       });
       console.log('Appointment cancelled successfully', response);

apps/ehr/src/components/LocationSelect.tsx

@@ -104,7 +104,6 @@ export default function LocationSelect({
 
   const getLocationLabel = (location: LocationWithWalkinSchedule): string => {
     if (!location.name) {
-      console.log('Location name is undefined', location);
       return 'Unknown Location';
     }
     return location.address?.state ? `${location.address.state.toUpperCase()} - ${location.name}` : location.name;

apps/ehr/src/components/PatientEncountersGrid.tsx

@@ -545,7 +545,11 @@ export const PatientEncountersGrid: FC<PatientEncountersGridProps> = (props) =>
             ) : (
               paginatedData.map((row, index) => {
                 const rowId = row.appointmentId || `row-${index}`;
-                const followupEncountersForRow = row.followUps ?? [];
+                const followupEncountersForRow = [...(row.followUps ?? [])].sort(
+                  (a, b) =>
+                    DateTime.fromISO(a.dateTime ?? '').diff(DateTime.fromISO(b.dateTime ?? ''), 'milliseconds')
+                      .milliseconds
+                );
                 const hasFollowups = followupEncountersForRow.length > 0;
 
                 return (

apps/ehr/src/components/PatientPaymentsList.tsx

@@ -23,16 +23,18 @@ import { useMutation } from '@tanstack/react-query';
 import { Appointment, DocumentReference, Encounter, Organization, Patient } from 'fhir/r4b';
 import { DateTime } from 'luxon';
 import { enqueueSnackbar } from 'notistack';
-import { FC, Fragment, ReactElement, useEffect, useState } from 'react';
+import { FC, Fragment, ReactElement, useState } from 'react';
+import { getEligibilityCheckDetailsForCoverage } from 'src/features/visits/shared/components/patient/InsuranceSection';
 import { useOystehrAPIClient } from 'src/features/visits/shared/hooks/useOystehrAPIClient';
 import { useApiClients } from 'src/hooks/useAppClients';
-import { useGetEncounter } from 'src/hooks/useEncounter';
+import { useEncounterReceipt, useGetEncounter } from 'src/hooks/useEncounter';
 import { useGetPatientAccount } from 'src/hooks/useGetPatient';
 import { useGetPatientPaymentsList } from 'src/hooks/useGetPatientPaymentsList';
 import {
   APIError,
   APIErrorCode,
   CashOrCardPayment,
+  CoverageCheckWithDetails,
   FHIR_EXTENSION,
   getCoding,
   getPaymentVariantFromEncounter,
@@ -42,7 +44,6 @@ import {
   PatientPaymentDTO,
   PaymentVariant,
   PostPatientPaymentInput,
-  RECEIPT_CODE,
   SendReceiptByEmailZambdaInput,
   SERVICE_CATEGORY_SYSTEM,
   updateEncounterPaymentVariantExtension,
@@ -88,13 +89,19 @@ export default function PatientPaymentList({
   const theme = useTheme();
   const [paymentDialogOpen, setPaymentDialogOpen] = useState(false);
   const [sendReceiptByEmailDialogOpen, setSendReceiptByEmailDialogOpen] = useState(false);
-  const [receiptDocRefId, setReceiptDocRefId] = useState<string | undefined>();
+
   const {
     data: encounter,
     refetch: refetchEncounter,
     isRefetching: isEncounterRefetching,
   } = useGetEncounter({ encounterId });
 
+  const {
+    data: receiptDocRef,
+    refetch: refetchReceipt,
+    isFetching: isReceiptFetching,
+  } = useEncounterReceipt({ encounterId });
+
   const {
     data: paymentData,
     refetch: refetchPaymentList,
@@ -121,15 +128,21 @@ export default function PatientPaymentList({
     code: string;
     coverageCode: string;
     levelCode: string;
-    periodCode: string;
-  }): number | undefined {
-    return coverage?.find(
+    periodCode: string | undefined;
+  }): PatientPaymentBenefit | undefined {
+    if (!periodCode) {
+      return coverage.find(
+        (item) => item.code === code && item.coverageCode === coverageCode && item.levelCode === levelCode
+      );
+    }
+
+    return coverage.find(
       (item) =>
         item.code === code &&
         item.coverageCode === coverageCode &&
         item.levelCode === levelCode &&
         item.periodCode === periodCode
-    )?.amountInUSD;
+    );
   }
 
   const payments = paymentData?.payments ?? []; // Replace with actual payments when available
@@ -139,30 +152,7 @@ export default function PatientPaymentList({
       ? (paymentListError as APIError).code === APIErrorCode.STRIPE_CUSTOMER_ID_DOES_NOT_EXIST
       : false;
 
-  useEffect(() => {
-    if (oystehr && encounterId) {
-      void oystehr.fhir
-        .search<DocumentReference>({
-          resourceType: 'DocumentReference',
-          params: [
-            {
-              name: 'type',
-              value: RECEIPT_CODE,
-            },
-            {
-              name: 'encounter',
-              value: 'Encounter/' + encounterId,
-            },
-          ],
-        })
-        .then((response) => {
-          const docRef = response.unbundle()[0];
-          if (docRef) {
-            setReceiptDocRefId(docRef.id);
-          }
-        });
-    }
-  }, [encounterId, oystehr, paymentData]);
+  const receiptDocRefId = receiptDocRef?.id;
 
   const sendReceipt = async (formData: SendReceiptFormData): Promise<void> => {
     if (!oystehr) return;
@@ -214,17 +204,34 @@ export default function PatientPaymentList({
 
   const createNewPayment = useMutation({
     mutationFn: async (input: PostPatientPaymentInput) => {
-      if (oystehrZambda && input) {
-        return oystehrZambda.zambda
-          .execute({
-            id: 'patient-payments-post',
-            ...input,
-          })
-          .then(async () => {
-            await refetchPaymentList();
-            setPaymentDialogOpen(false);
-          });
-      }
+      if (!oystehrZambda) return;
+
+      await oystehrZambda.zambda.execute({
+        id: 'patient-payments-post',
+        ...input,
+      });
+    },
+    onSuccess: async () => {
+      await refetchPaymentList();
+      const waitForReceipt = async (): Promise<void> => {
+        let receipt: DocumentReference | null = null;
+        const maxTries = 15;
+        let tries = 0;
+
+        while (!receipt && tries < maxTries) {
+          const result = await refetchReceipt();
+
+          receipt = result.data ?? null;
+          if (!receipt) {
+            await new Promise((res) => setTimeout(res, 2000));
+          }
+          tries += 1;
+        }
+      };
+
+      await waitForReceipt();
+
+      setPaymentDialogOpen(false);
     },
     retry: 0,
   });
@@ -288,16 +295,24 @@ export default function PatientPaymentList({
     (extensionTemp) => extensionTemp.url === FHIR_EXTENSION.InsurancePlan.notes.url
   )?.valueString;
 
+  let coverageCheck: CoverageCheckWithDetails | undefined = undefined;
+  if (insuranceCoverages?.coverages?.primary && insuranceData?.coverageChecks) {
+    coverageCheck = getEligibilityCheckDetailsForCoverage(
+      insuranceCoverages?.coverages?.primary,
+      insuranceData?.coverageChecks
+    );
+  }
+
   const copayAmount = getPaymentAmountFromPatientBenefit({
-    coverage: insuranceData?.coverageChecks?.[0]?.copay || [],
+    coverage: coverageCheck?.copay?.filter((item) => item.inNetwork === true) || [],
     code: 'UC',
     coverageCode: 'B',
     levelCode: 'IND',
-    periodCode: '27',
+    periodCode: undefined,
   });
 
   const remainingDeductibleAmount = getPaymentAmountFromPatientBenefit({
-    coverage: insuranceData?.coverageChecks?.[0]?.deductible || [],
+    coverage: coverageCheck?.deductible?.filter((item) => item.inNetwork === true) || [],
     code: '30',
     coverageCode: 'C',
     levelCode: 'IND',
@@ -379,13 +394,13 @@ export default function PatientPaymentList({
                 <TableRow>
                   <TableCell style={{ fontSize: '16px' }}>Copay</TableCell>
                   <TableCell style={{ fontSize: '16px', fontWeight: 'bold', textAlign: 'right' }}>
-                    {copayAmount ? `$${copayAmount}` : 'Unknown'}
+                    {copayAmount ? `$${copayAmount?.amountInUSD} / ${copayAmount?.periodDescription}` : 'Unknown'}
                   </TableCell>
                 </TableRow>
                 <TableRow sx={{ '&:last-child td': { borderBottom: 'none' } }}>
                   <TableCell style={{ fontSize: '16px' }}>Remaining Deductible</TableCell>
                   <TableCell style={{ fontSize: '16px', fontWeight: 'bold', textAlign: 'right' }}>
-                    {remainingDeductibleAmount ? `$${remainingDeductibleAmount}` : 'Unknown'}
+                    {remainingDeductibleAmount ? `$${remainingDeductibleAmount?.amountInUSD}` : 'Unknown'}
                   </TableCell>
                 </TableRow>
               </TableBody>
@@ -494,7 +509,7 @@ export default function PatientPaymentList({
             <span>
               <Button
                 sx={{ mt: 2, ml: 2 }}
-                disabled={!receiptDocRefId}
+                disabled={!receiptDocRefId || isReceiptFetching}
                 onClick={() => setSendReceiptByEmailDialogOpen(true)}
                 variant="contained"
                 color="primary"

apps/ehr/src/components/dialogs/CancellationReasonDialog.tsx

@@ -16,7 +16,7 @@ import {
 import { Appointment, Encounter } from 'fhir/r4b';
 import { enqueueSnackbar } from 'notistack';
 import React, { ReactElement, useState } from 'react';
-import { CancelAppointmentZambdaInput, VALUE_SETS } from 'utils';
+import { CancelAppointmentZambdaInput, isTelemedAppointment, VALUE_SETS } from 'utils';
 import { cancelAppointment } from '../../api/api';
 import { dataTestIds } from '../../constants/data-test-ids';
 import { useApiClients } from '../../hooks/useAppClients';
@@ -59,6 +59,10 @@ export default function CancellationReasonDialog({
     },
   };
 
+  const cancelOptions = isTelemedAppointment(appointment)
+    ? VALUE_SETS.cancelReasonOptionsVirtualProvider
+    : VALUE_SETS.cancelReasonOptionsInPersonProvider;
+
   const handleCancel = async (event: React.FormEvent<HTMLFormElement>): Promise<void> => {
     event.preventDefault();
     setCancelLoading(true);
@@ -143,7 +147,7 @@ export default function CancellationReasonDialog({
                 renderValue={(selected) => selected}
                 MenuProps={MenuProps}
               >
-                {VALUE_SETS.cancelReasonOptions.map((reason) => (
+                {cancelOptions.map((reason) => (
                   <MenuItem key={reason.value} value={reason.value}>
                     <ListItemText primary={reason.label} />
                   </MenuItem>

apps/ehr/src/components/form/DatePicker.tsx

@@ -10,7 +10,7 @@ import { Control, Controller, RegisterOptions } from 'react-hook-form';
 interface BasicDatePickerProps {
   name: string;
   control: Control<any>;
-  rules: RegisterOptions;
+  rules?: RegisterOptions;
   required?: boolean;
   defaultValue?: string;
   onChange?: (date: string) => void;
@@ -27,7 +27,7 @@ interface BasicDatePickerProps {
 export function BasicDatePicker({
   name,
   control,
-  rules,
+  rules = {},
   defaultValue,
   onChange,
   disabled,

apps/ehr/src/constants/data-test-ids.ts

@@ -63,7 +63,7 @@ export const dataTestIds = {
     sexAtBirthDropdown: 'sex-at-birth-dropdown',
     reasonForVisitDropdown: 'reason-for-visit-dropdown',
     visitTypeDropdown: 'visit-type-dropdown',
-    serviceCategoryDropdown: ' service-category-dropdown',
+    serviceCategoryDropdown: 'service-category-dropdown',
     dateFormatValidationError: 'date-format-validation-error',
     prefillForButton: 'prefill-for-button',
     prefilledPatientName: 'prefilled-patient-name',

apps/ehr/src/constants/index.ts

@@ -41,7 +41,7 @@ export const MOBILE_MODAL_STYLE = {
   p: 4,
 };
 
-export const TYPE_WIDTH_MIN = '160px';
+export const TYPE_WIDTH_MIN = '195px';
 export const TIME_WIDTH_MIN = '140px';
 export const PATIENT_AND_REASON_WIDTH_MIN = '300px';
 export const ROOM_WIDTH_MIN = '120px';

apps/ehr/src/features/external-labs/components/labs-orders/usePatientLabOrders.ts

@@ -58,7 +58,8 @@ interface UsePatientLabOrdersResult<SearchBy extends LabOrdersSearchBy> {
 }
 
 export const usePatientLabOrders = <SearchBy extends LabOrdersSearchBy>(
-  _searchBy: SearchBy
+  _searchBy: SearchBy,
+  refreshKey?: number
 ): UsePatientLabOrdersResult<SearchBy> => {
   const { oystehrZambda } = useApiClients();
   const navigate = useNavigate();
@@ -198,7 +199,7 @@ export const usePatientLabOrders = <SearchBy extends LabOrdersSearchBy>(
     } else {
       console.error('searchParams are not valid', searchParams);
     }
-  }, [fetchLabOrders, page, memoizedSearchBy]);
+  }, [fetchLabOrders, page, memoizedSearchBy, refreshKey]);
 
   const handleDeleteLabOrder = useCallback(
     async ({ serviceRequestId }: DeleteLabOrderZambdaInput): Promise<boolean> => {