@ampath/esm-dha-workflow-app 4.0.0-next.340 → 4.0.0-next.344

package/src/billing/dashboard/v2/patient-bill-details/attachments/invoice.component.tsx

@@ -33,8 +33,8 @@ const InvoiceComponent = forwardRef<HTMLDivElement, InvoiceComponentProps>(({ bi
   }
 
   const items =
-    Array.isArray(bill.items) && bill.items.length > 0
-      ? bill.items
+    Array.isArray(bill) && bill.length > 0
+      ? bill
       : [
           {
             billable_service: bill.billable_service,

package/src/billing/dashboard/v2/types/index.ts

@@ -470,6 +470,12 @@ export interface PatientBill {
   payments: BillPayment[];
   visit_uuid: string;
   visit_type_uuid: string;
+  location_name: string;
+  location_uuid: string;
+  national_id: string;
+  paid_status: string;
+  visit_start_date: string;
+  cr_id: string;
 }
 
 export interface PendingLineItem {

package/src/billing/dashboard/v3/claim-visits/claim-intervention-details/claim-intervention-details.component.tsx

@@ -27,6 +27,7 @@ interface claimInterventionDetailsProps {
   visitUuid: string;
   canSwitchIntervention?: boolean;
   onSwitchSuccess?: () => void;
+  billingDate: string;
 }
 
 const isActiveIntervention = (iv: VisitIntervention) => (iv.workflow_state ?? '').toUpperCase() === 'ACTIVE';
@@ -38,6 +39,7 @@ const ClaimInterventionDetails: React.FC<claimInterventionDetailsProps> = ({
   visitUuid,
   canSwitchIntervention = false,
   onSwitchSuccess,
+  billingDate,
 }) => {
   const session = useSession();
   const locationUuid = session?.sessionLocation?.uuid;
@@ -61,6 +63,7 @@ const ClaimInterventionDetails: React.FC<claimInterventionDetailsProps> = ({
       claimInterventions: ci,
       bill: patientBillDetails,
       patientUuid: patientBillDetails?.patient_uuid,
+      billingDate: billingDate,
     });
   };
 
@@ -75,7 +78,9 @@ const ClaimInterventionDetails: React.FC<claimInterventionDetailsProps> = ({
     canActOnIntervention(intervention) && !hasBlockingPreauth(intervention);
 
   const canRaisePreauthFor = (intervention: VisitIntervention) => {
-    return canActOnIntervention(intervention) && Boolean(intervention.needs_preauth) && !hasBlockingPreauth(intervention);
+    return (
+      canActOnIntervention(intervention) && Boolean(intervention.needs_preauth) && !hasBlockingPreauth(intervention)
+    );
   };
 
   const isResubmitPreauth = (intervention: VisitIntervention) =>

package/src/billing/dashboard/v3/claim-visits/claim-visit-details/claim-visit-details.component.tsx

@@ -26,6 +26,7 @@ interface claimVisitDetailsProps {
   onBillDetailsChange?: () => void;
   /** True while claim preview is revalidating — stand down content edits. */
   claimRefreshing?: boolean;
+  billingDate?: string;
 }
 const ClaimVisitDetails: React.FC<claimVisitDetailsProps> = ({
   claimsVisit,
@@ -33,6 +34,7 @@ const ClaimVisitDetails: React.FC<claimVisitDetailsProps> = ({
   patientBillDetails,
   onBillDetailsChange,
   claimRefreshing = false,
+  billingDate,
 }) => {
   const [showCloseClaimModal, setShowCloseClaimModal] = useState<boolean>();
   const [showSubmitClaimModal, setSubmitCloseClaimModal] = useState<boolean>(false);
@@ -181,16 +183,10 @@ const ClaimVisitDetails: React.FC<claimVisitDetailsProps> = ({
             <h4>Claim Visit Details</h4>
           </div>
           <div className={styles.headerAction}>
-            <Button
-              kind="primary"
-              onClick={displayCloseClaimModal}
-              disabled={!canEditClaim}>
+            <Button kind="primary" onClick={displayCloseClaimModal} disabled={!canEditClaim}>
               Close Claim
             </Button>
-            <Button
-              kind="tertiary"
-              onClick={displayCloseSubmitClaimModal}
-              disabled={!canEditClaim}>
+            <Button kind="tertiary" onClick={displayCloseSubmitClaimModal} disabled={!canEditClaim}>
               Submit claim
             </Button>
             <Button
@@ -290,6 +286,7 @@ const ClaimVisitDetails: React.FC<claimVisitDetailsProps> = ({
                     invalidateProviderClaimPreview();
                     onBillDetailsChange?.();
                   }}
+                  billingDate={billingDate}
                 />
               )}
             </div>

package/src/billing/dashboard/v3/facility-bills/facility-bills.component.tsx

@@ -57,11 +57,11 @@ const FacilityBillsV3: React.FC<facilityBillsProps> = ({ billingDate, locationUu
     const statusArr = status.split(',');
 
     if (statusArr.length > 0) {
-       const hasPostedBill = statusArr.some((s) => {
+      const hasPostedBill = statusArr.some((s) => {
         return s === 'POSTED';
       });
-      if(hasPostedBill){
-        return 'PARTIALLY PAID'
+      if (hasPostedBill) {
+        return 'PARTIALLY PAID';
       }
       const hasPendingBill = statusArr.some((s) => {
         return s === 'PENDING';
@@ -75,74 +75,77 @@ const FacilityBillsV3: React.FC<facilityBillsProps> = ({ billingDate, locationUu
       return status;
     }
   }
-  const filteredBills = (facilityBills ?? []).filter((fb) => {
-    const term = search.trim().toLowerCase();
-    return (
-      !term ||
-      `${fb.patient_name} ${formatStatusColumn(fb.bill_status)} ${fb.cash_point}`.toLowerCase().includes(term)
-    );
-  });
+
+  const formatDate = (date?: string | null) => {
+    if (!date) return '—';
+
+    return new Intl.DateTimeFormat('en-KE', {
+      year: 'numeric',
+      month: 'short',
+      day: '2-digit',
+    }).format(new Date(date));
+  };
 
   return (
     <>
       <TableToolbar
-            id="facility-bills"
-            search={search}
-            onSearch={setSearch}
-            searchPlaceholder="Search patient, status or cash point…"
-            onDate={onDateChange}
+        id="facility-bills"
+        search={search}
+        onSearch={setSearch}
+        searchPlaceholder="Search patient, status or cash point…"
+        onDate={onDateChange}
       />
       {currentView === BillingView.Bills ? (
         (facilityBills ?? []).length === 0 ? (
           <EmptyState message="No bills." />
         ) : (
-        <>
-          {filteredBills.length === 0 ? (
-            <EmptyState message="No bills match your search." />
-          ) : (
-            <Table aria-label="facility bills" size="sm">
-              <TableHead>
-                <TableRow>
-                  <TableHeader>No</TableHeader>
-                  <TableHeader>Date</TableHeader>
-                  <TableHeader>Patient</TableHeader>
-                  <TableHeader>Status</TableHeader>
-                  <TableHeader>Cashpoint</TableHeader>
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {filteredBills.map((fb, index) => {
-                  return (
-                    <TableRow key={fb.patient_uuid}>
-                      <TableCell>{index + 1}</TableCell>
-                      <TableCell>{fb.bill_date}</TableCell>
-                      <TableCell>
-                        <div
-                          className={styles.clickableData}
-                          onClick={() => toggleView(BillingView.BillDetails, fb.patient_uuid)}
-                        >
-                          {fb.patient_name}
-                        </div>
-                      </TableCell>
-                      <TableCell>
-                        {(() => {
-                          const s = formatStatusColumn(fb.bill_status);
-                          const type = s === 'PAID' ? 'green' : s === 'PENDING' ? 'gray' : 'blue';
-                          return (
-                            <Tag size="sm" type={type}>
-                              {s}
-                            </Tag>
-                          );
-                        })()}
-                      </TableCell>
-                      <TableCell>{fb.cash_point}</TableCell>
-                    </TableRow>
-                  );
-                })}
-              </TableBody>
-            </Table>
-          )}
-        </>
+          <>
+            {facilityBills.length === 0 ? (
+              <EmptyState message="No bills match your search." />
+            ) : (
+              <Table aria-label="facility bills" size="sm">
+                <TableHead>
+                  <TableRow>
+                    <TableHeader>No</TableHeader>
+                    <TableHeader>Date</TableHeader>
+                    <TableHeader>Patient</TableHeader>
+                    <TableHeader>Status</TableHeader>
+                    <TableHeader>Identifier</TableHeader>
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  {facilityBills.map((fb, index) => {
+                    return (
+                      <TableRow key={fb.patient_uuid}>
+                        <TableCell>{index + 1}</TableCell>
+                        <TableCell>{formatDate(fb.visit_start_date)}</TableCell>
+                        <TableCell>
+                          <div
+                            className={styles.clickableData}
+                            onClick={() => toggleView(BillingView.BillDetails, fb.patient_uuid)}
+                          >
+                            {fb.patient_name}
+                          </div>
+                        </TableCell>
+                        <TableCell>
+                          {(() => {
+                            const s = formatStatusColumn(fb.paid_status);
+                            const type = s === 'PAID' ? 'green' : s === 'PENDING' ? 'gray' : 'blue';
+                            return (
+                              <Tag size="sm" type={type}>
+                                {s}
+                              </Tag>
+                            );
+                          })()}
+                        </TableCell>
+                        <TableCell>{fb.cr_id}</TableCell>
+                      </TableRow>
+                    );
+                  })}
+                </TableBody>
+              </Table>
+            )}
+          </>
         )
       ) : (
         <></>

package/src/billing/dashboard/v3/patient-bill-details/attachments/case-summary/case-summary.tsx

@@ -29,9 +29,10 @@ function SectionBlock({ number, title, children }) {
 
 interface CaseSummaryProps {
   patientUuid: string;
+  billingDate: string;
 }
 
-const CaseSummary = forwardRef<HTMLDivElement, CaseSummaryProps>(({ patientUuid }, ref) => {
+const CaseSummary = forwardRef<HTMLDivElement, CaseSummaryProps>(({ patientUuid, billingDate }, ref) => {
   const [caseSummary, setCasesummary] = useState<VisitSummaryResponse>();
   const [vitals, setVitals] = useState<VitalReading[]>();
   const session = useSession();
@@ -64,6 +65,13 @@ const CaseSummary = forwardRef<HTMLDivElement, CaseSummaryProps>(({ patientUuid
       });
     }
   };
+  const filteredConditions =
+    caseSummary?.conditions?.filter((condition) => {
+      const conditionDate = formatDate(condition.onsetDate);
+      const billDate = formatDate(billingDate);
+
+      return conditionDate === billDate;
+    }) ?? [];
 
   useEffect(() => {
     if (!locationUuid) return;
@@ -106,11 +114,15 @@ const CaseSummary = forwardRef<HTMLDivElement, CaseSummaryProps>(({ patientUuid
         {/* {p.alert && <div className={styles['cs-alert']}>{p.alert}</div>} */}
 
         <SectionBlock number="1" title="Allergies">
-          {caseSummary?.allergies.map((a, i) => (
-            <div key={i} className={styles['cs-field-value']}>
-              ✓ {a.label}
-            </div>
-          ))}
+          {caseSummary?.allergies?.length ? (
+            caseSummary.allergies.map((a, i) => (
+              <div key={i} className={styles['cs-field-value']}>
+                ✓ {a.substance} ({a.criticality}) — {a.reaction}
+              </div>
+            ))
+          ) : (
+            <div className={styles['cs-field-value']}>No known allergies</div>
+          )}
         </SectionBlock>
 
         <SectionBlock number="2" title="Active Diagnoses">
@@ -118,16 +130,14 @@ const CaseSummary = forwardRef<HTMLDivElement, CaseSummaryProps>(({ patientUuid
             <thead>
               <tr>
                 <th>Date</th>
-                <th>Code</th>
                 <th>Description</th>
                 <th>Status</th>
               </tr>
             </thead>
             <tbody>
-              {caseSummary?.conditions.map((d, i) => (
+              {filteredConditions?.map((d, i) => (
                 <tr key={i}>
                   <td>{formatDate(d.onsetDate)}</td>
-                  <td>{d.code}</td>
                   <td>
                     {d.description}
                     {d.primary && <span className={styles['cs-pill']}>Primary</span>}
@@ -233,13 +243,17 @@ const CaseSummary = forwardRef<HTMLDivElement, CaseSummaryProps>(({ patientUuid
         </SectionBlock>
 
         <SectionBlock number="7" title="Admission Details">
-          <div className={styles['cs-field-grid']}>
-            <Field label="Status" value={caseSummary?.inpatientDetails?.status} />
-            <Field label="Admission Date" value={formatDate(caseSummary?.inpatientDetails?.admissionDate)} />
-            <Field label="Admission Diagnosis" value={caseSummary?.inpatientDetails?.diagnosis} />
-            <Field label="Primary Doctor" value={caseSummary?.inpatientDetails?.admittingDoctor} />
-            <Field label="Ward / Bed" value={caseSummary?.inpatientDetails?.ward} />
-          </div>
+          {caseSummary?.inpatientDetails ? (
+            <div className={styles['cs-field-grid']}>
+              <Field label="Status" value={caseSummary?.inpatientDetails?.status} />
+              <Field label="Admission Date" value={formatDate(caseSummary?.inpatientDetails?.admissionDate)} />
+              <Field label="Admission Diagnosis" value={caseSummary?.inpatientDetails?.diagnosis} />
+              <Field label="Primary Doctor" value={caseSummary?.inpatientDetails?.admittingDoctor} />
+              <Field label="Ward / Bed" value={caseSummary?.inpatientDetails?.ward} />
+            </div>
+          ) : (
+            <></>
+          )}
         </SectionBlock>
 
         {/* <SectionBlock number="8" title="Encounter Log">

package/src/billing/dashboard/v3/patient-bill-details/attachments/generate-attachments.component.tsx

@@ -23,6 +23,7 @@ interface GenerateAttachmentsProps extends DefaultWorkspaceProps {
   bill: any;
   consentToken: string;
   patientUuid: string;
+  billingDate: string;
 }
 
 const GenerateAttachments: React.FC<GenerateAttachmentsProps> = ({
@@ -32,6 +33,7 @@ const GenerateAttachments: React.FC<GenerateAttachmentsProps> = ({
   bill,
   consentToken,
   patientUuid,
+  billingDate,
 }) => {
   const { t } = useTranslation();
   const [previewUrl, setPreviewUrl] = useState<string>();
@@ -332,7 +334,7 @@ const GenerateAttachments: React.FC<GenerateAttachmentsProps> = ({
         <DischargeSummaryComponent ref={dischargeRef} claimIntervention={claimInterventions} bill={bill} />
 
         <FinalBillComponent ref={finalBillRef} bill={bill} />
-        <CaseSummary ref={caseSummaryRef} patientUuid={patientUuid} />
+        <CaseSummary ref={caseSummaryRef} patientUuid={patientUuid} billingDate={billingDate} />
         <DialysisChart ref={dialysisRef} patientUuid={patientUuid} />
         <GeneralDischargeSummary ref={generalDischargeSummary} patientUuid={patientUuid} />
       </div>

package/src/billing/dashboard/v3/patient-bill-details/bill-details/bill-details.scss

@@ -10,4 +10,8 @@
         width: 100%;
         row-gap: 10px;
     }
+}
+.radioGroup {
+    margin: 1rem;
+
 }