diff --git a/app/Controllers/Opd.php b/app/Controllers/Opd.php index e933f81..af14e1d 100644 --- a/app/Controllers/Opd.php +++ b/app/Controllers/Opd.php @@ -2796,15 +2796,27 @@ class Opd extends BaseController }; $rxInvestigation = $rxRead($rx, ['investigation', 'Investigations', 'investigations', 'Investigation']); + $rxInvestigationTestList = ''; if ($rxInvestigation === '' && !empty($data['rx_investigations']) && is_array($data['rx_investigations'])) { $parts = []; + $testNames = []; foreach ($data['rx_investigations'] as $inv) { $txt = trim((string) ($inv['investigation_name'] ?? $inv['investigation'] ?? '')); if ($txt !== '') { $parts[] = $txt; + $testNames[] = $txt; } } $rxInvestigation = implode(', ', $parts); + + // Build formatted test list for {{Tadvise_test_list}} placeholder + if (!empty($testNames)) { + $rxInvestigationTestList = ''; + } } $rxAdvice = $rxRead($rx, ['advice', 'Advice', 'prescription_advice', 'advice_notes', 'advice_note']); @@ -3045,6 +3057,7 @@ class Opd extends BaseController 'provisional_diagnosis_snomed_source' => $provisionalDiagnosisSnomedSource, 'investigation' => $rxInvestigation, 'investigation_local' => $investigationLocal, + 'Tadvise_test_list' => $rxInvestigationTestList, 'medical' => $medicalHtml, 'doctor' => '

Dr. ' . esc((string) ($opd->doc_name ?? '')) . '

', 'top_content' => '', diff --git a/app/Views/billing/opd_template_builder.php b/app/Views/billing/opd_template_builder.php index b3d201a..cc640ec 100644 --- a/app/Views/billing/opd_template_builder.php +++ b/app/Views/billing/opd_template_builder.php @@ -70,7 +70,7 @@ $opdConsultSet = [ 'diagnosis_snomed_id', 'diagnosis_snomed_term', 'diagnosis_snomed_source', 'provisional_diagnosis_snomed_id', 'provisional_diagnosis_snomed_term', 'provisional_diagnosis_snomed_source', 'complaint_list', 'diagnosis_list', 'provisional_diagnosis_list', - 'medical', 'investigation', 'prescriber_remarks', 'advice', 'next_visit', 'refer_to', + 'medical', 'investigation', 'Tadvise_test_list', 'prescriber_remarks', 'advice', 'next_visit', 'refer_to', 'rx', 'rxtable', 'rxfullblock', 'vitalsblock', 'complaintblock', 'diagnosisblock', 'investigationblock', 'remarksblock', 'adviceblock', 'nextvisitblock',