diff --git a/app/Controllers/Opd.php b/app/Controllers/Opd.php index 6dfb523..1d19c09 100644 --- a/app/Controllers/Opd.php +++ b/app/Controllers/Opd.php @@ -120,7 +120,7 @@ class Opd extends BaseController // Patient 'pName', 'pRelative', 'age_sex', 'phoneno', 'p_address', 'uhid_no', 'opd_sr_no', 'opd_no', 'opd_date', 'exp_date', - 'opd_fee_desc', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date', + 'opd_fee_amount', 'opd_fee_desc', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date', // General Examination (raw values) 'bp', 'bp_diastolic', 'pulse', 'temp', 'spo2', 'rr_min', 'height', 'weight', 'waist', @@ -2543,7 +2543,9 @@ class Opd extends BaseController $specName = trim((string) ($doctor->SpecName ?? $opd->doc_spec ?? '')); $doctorShortDescription = trim((string) ($doctor->doc_sign ?? $opd->doc_sign ?? '')); - $opdFeeDesc = trim((string) (($opd->opd_fee_amount ?? '') . ' ' . ($opd->opd_fee_desc ?? ''))); + $opdFeeAmount = trim((string) ($opd->opd_fee_amount ?? '')); + $opdFeeDescription = trim((string) ($opd->opd_fee_desc ?? '')); + $opdFeeDisplay = trim($opdFeeAmount . ' ' . $opdFeeDescription); $totalNoVisit = $this->resolveTotalOpdVisitCountForPrint($opd); $lastVisitDate = ''; $lastVisitText = ''; @@ -3022,7 +3024,7 @@ class Opd extends BaseController . '' . '