d_s_bisht/devsofttech_hms_ci4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change {{Tadvise_test_list}} to comma-separated format (not bullet list)

Browse Source 
Changed placeholder behavior to match user requirements:
- {{investigation}} = textarea content (advise_investigation_notes) only
- {{Tadvise_test_list}} = comma-separated test names from table

Removed HTML bullet list formatting. Now outputs plain comma-separated text.

Example output:
CBC (Complete Blood Count), ECG (Electrocardiogram), HBA1C, HBSAG, HCV,
HIV I & II (Elisa), Liver Function Test (LFT), PT/INR, Renal Function Test (RFT),
Urine Routine & Microscopy, X-Ray Chest (PA View)

Both placeholders are independent and can show content simultaneously.
This commit is contained in:
DevSoftTech Server 2026-06-05 15:59:16 +05:30
parent 0b865f41cd
commit a1fbf50f3f
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Controllers/Opd.php
View File

@ -2804,11 +2804,11 @@ class Opd extends BaseController
$rxInvestigation = $rxRead($rx, ['investigation', 'Investigations', 'investigations', 'Investigation']); $rxInvestigation = $rxRead($rx, ['investigation', 'Investigations', 'investigations', 'Investigation']);
// Build test list independently from textarea content // Build test list from table (comma-separated, not bullet list)
$rxInvestigationTestList = ''; $rxInvestigationTestList = '';
$testNames = []; $testNames = [];
// First, try to get tests from rx_investigations table // Get tests from rx_investigations table
if (!empty($data['rx_investigations']) && is_array($data['rx_investigations'])) { if (!empty($data['rx_investigations']) && is_array($data['rx_investigations'])) {
foreach ($data['rx_investigations'] as $inv) { foreach ($data['rx_investigations'] as $inv) {
$txt = trim((string) ($inv['investigation_name'] ?? $inv['investigation'] ?? '')); $txt = trim((string) ($inv['investigation_name'] ?? $inv['investigation'] ?? ''));
@ -2818,30 +2818,10 @@ class Opd extends BaseController
} }
} }
// If no tests from table but textarea has content, parse textarea as fallback // Build comma-separated test list for {{Tadvise_test_list}} placeholder
if (empty($testNames) && $rxInvestigation !== '') { // This is independent from {{investigation}} textarea content
// Split by newlines or common delimiters
$lines = preg_split('/[\r\n]+/', $rxInvestigation);
foreach ($lines as $line) {
$line = trim($line);
if ($line !== '' && $line !== 'null') {
$testNames[] = $line;
}
}
}
// If textarea is empty, populate it with comma-separated tests from table
if ($rxInvestigation === '' && !empty($testNames)) {
$rxInvestigation = implode(', ', $testNames);
}
// Always build formatted HTML test list for {{Tadvise_test_list}} placeholder
if (!empty($testNames)) { if (!empty($testNames)) {
$rxInvestigationTestList = '<ul style="margin:3px 0 0 16px;padding:0;list-style-type:disc;">'; $rxInvestigationTestList = implode(', ', $testNames);
foreach ($testNames as $testName) {
$rxInvestigationTestList .= '<li style="margin-bottom:3px;font-weight:400;line-height:1.5;color:#111;">' . htmlspecialchars($testName, ENT_QUOTES, 'UTF-8') . '</li>';
}
$rxInvestigationTestList .= '</ul>';
} }
$rxAdvice = $rxRead($rx, ['advice', 'Advice', 'prescription_advice', 'advice_notes', 'advice_note']); $rxAdvice = $rxRead($rx, ['advice', 'Advice', 'prescription_advice', 'advice_notes', 'advice_note']);