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

fix: include medicine qty in {{medical}} consult print placeholder

Browse Source
This commit is contained in:
DevSoftTech Server 2026-04-10 14:27:35 +05:30
parent 54d0afaf95
commit 2c3552ac07
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/Opd.php
View File

@ -2312,7 +2312,7 @@ class Opd extends BaseController
$medicalHtml = ''; $medicalHtml = '';
if (!empty($rxMeds)) { if (!empty($rxMeds)) {
$medicalHtml .= '<table width="100%" style="border-collapse:collapse;font-size:12px;">'; $medicalHtml .= '<table width="100%" style="border-collapse:collapse;font-size:12px;">';
$medicalHtml .= '<tr><th style="text-align:left;">#</th><th style="text-align:left;">Medicine</th><th style="text-align:left;">Dose/Freq</th><th style="text-align:left;">Day</th><th style="text-align:left;">Instruction</th></tr>'; $medicalHtml .= '<tr><th style="text-align:left;">#</th><th style="text-align:left;">Medicine</th><th style="text-align:left;">Dose/Freq</th><th style="text-align:left;">Qty</th><th style="text-align:left;">Day</th><th style="text-align:left;">Instruction</th></tr>';
$i = 0; $i = 0;
foreach ($rxMeds as $med) { foreach ($rxMeds as $med) {
$i++; $i++;
@ -2348,6 +2348,8 @@ class Opd extends BaseController
$freq = trim((string) ($med['dosage_freq_label'] ?? $med['dosage_freq'] ?? $med['drug_freq'] ?? $med['frequency'] ?? '')); $freq = trim((string) ($med['dosage_freq_label'] ?? $med['dosage_freq'] ?? $med['drug_freq'] ?? $med['frequency'] ?? ''));
$doseLocalRaw = trim((string) ($med['dosage_local_label'] ?? $med['dosage_local'] ?? '')); $doseLocalRaw = trim((string) ($med['dosage_local_label'] ?? $med['dosage_local'] ?? ''));
$freqLocalRaw = trim((string) ($med['dosage_freq_local_label'] ?? $med['dosage_freq_local'] ?? '')); $freqLocalRaw = trim((string) ($med['dosage_freq_local_label'] ?? $med['dosage_freq_local'] ?? ''));
$qtyRaw = trim((string) ($med['qty'] ?? $med['quantity'] ?? $med['drug_qty'] ?? ''));
$qty = ($qtyRaw === '0') ? '' : $qtyRaw;
$days = trim((string) ($med['no_of_days'] ?? $med['drug_day'] ?? $med['days'] ?? '')); $days = trim((string) ($med['no_of_days'] ?? $med['drug_day'] ?? $med['days'] ?? ''));
$when = trim((string) ($med['dosage_when_label'] ?? $med['dosage_when'] ?? '')); $when = trim((string) ($med['dosage_when_label'] ?? $med['dosage_when'] ?? ''));
$remark = trim((string) ($med['remark'] ?? '')); $remark = trim((string) ($med['remark'] ?? ''));
@ -2420,6 +2422,7 @@ class Opd extends BaseController
. '<td>' . esc($doseFreqText) . '<td>' . esc($doseFreqText)
. ($doseFreqLocal !== '' ? ('<div style="font-size:11px;color:#444;line-height:1.4;" lang="hi">' . esc($doseFreqLocal) . '</div>') : '') . ($doseFreqLocal !== '' ? ('<div style="font-size:11px;color:#444;line-height:1.4;" lang="hi">' . esc($doseFreqLocal) . '</div>') : '')
. '</td>' . '</td>'
. '<td>' . esc($qty) . '</td>'
. '<td>' . esc($days) . '</td>' . '<td>' . esc($days) . '</td>'
. '<td>' . esc($inst) . '<td>' . esc($inst)
. ($instLocal !== '' ? ('<div style="font-size:11px;color:#444;line-height:1.4;" lang="hi">' . esc($instLocal) . '</div>') : '') . ($instLocal !== '' ? ('<div style="font-size:11px;color:#444;line-height:1.4;" lang="hi">' . esc($instLocal) . '</div>') : '')