diff --git a/app/Controllers/Opd.php b/app/Controllers/Opd.php index 024ffb0..f2ed33c 100644 --- a/app/Controllers/Opd.php +++ b/app/Controllers/Opd.php @@ -2312,7 +2312,7 @@ class Opd extends BaseController $medicalHtml = ''; if (!empty($rxMeds)) { $medicalHtml .= ''; - $medicalHtml .= ''; + $medicalHtml .= ''; $i = 0; foreach ($rxMeds as $med) { $i++; @@ -2416,21 +2416,25 @@ class Opd extends BaseController if ($generic !== '') { $nameHtml .= '
Salt/Generic: ' . esc($generic) . '
'; } + + $hasInstruction = ($inst !== '' || $instLocal !== ''); + $baseRowCellStyle = $hasInstruction ? ' style="border-bottom:none;"' : ''; + $medicalHtml .= '' - . '' - . '' - . '' + . '' . $nameHtml . '' + . '' . esc($doseFreqText) . ($doseFreqLocal !== '' ? ('
' . esc($doseFreqLocal) . '
') : '') . '' - . '
' - . '' + . '' . esc($qty) . '' + . '' . esc($days) . '' . ''; - if ($inst !== '' || $instLocal !== '') { + if ($hasInstruction) { $medicalHtml .= '' . '' . '' . '';
#MedicineDose/FreqQtyDay
#MedicineDose/FreqQtyDay
' . $i . '' . $nameHtml . '' . esc($doseFreqText) + . '' . $i . '' . esc($qty) . '' . esc($days) . '
' - . '
Instruction: ' . esc($inst !== '' ? $inst : '-') . '
' + . '
' . esc($inst !== '' ? $inst : '-') . '
' . ($instLocal !== '' ? ('
' . esc($instLocal) . '
') : '') . '