From 5801b5d27675f4ab9ed3646067c0bdb5a96d97f7 Mon Sep 17 00:00:00 2001
From: DevSoftTech Server <info.devsofttech@gmail.com>
Date: Tue, 14 Apr 2026 07:50:50 +0530
Subject: [PATCH] Refine {{medical}} table widths and instruction row styling

---
 app/Controllers/Opd.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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 .= '<table width="100%" style="border-collapse:collapse;font-size:12px;">';
-            $medicalHtml .= '<tr><th style="text-align:left;width:5%;">#</th><th style="text-align:left;width:49%;">Medicine</th><th style="text-align:left;width:26%;">Dose/Freq</th><th style="text-align:left;width:10%;">Qty</th><th style="text-align:left;width:10%;">Day</th></tr>';
+            $medicalHtml .= '<tr><th style="text-align:left;width:5%;">#</th><th style="text-align:left;width:43%;">Medicine</th><th style="text-align:left;width:32%;">Dose/Freq</th><th style="text-align:left;width:10%;">Qty</th><th style="text-align:left;width:10%;">Day</th></tr>';
             $i = 0;
             foreach ($rxMeds as $med) {
                 $i++;
@@ -2416,21 +2416,25 @@ class Opd extends BaseController
                 if ($generic !== '') {
                     $nameHtml .= '<div style="font-size:11px;color:#444;">Salt/Generic: ' . esc($generic) . '</div>';
                 }
+
+                $hasInstruction = ($inst !== '' || $instLocal !== '');
+                $baseRowCellStyle = $hasInstruction ? ' style="border-bottom:none;"' : '';
+
                 $medicalHtml .= '<tr>'
-                    . '<td>' . $i . '</td>'
-                    . '<td>' . $nameHtml . '</td>'
-                    . '<td>' . esc($doseFreqText)
+                    . '<td' . $baseRowCellStyle . '>' . $i . '</td>'
+                    . '<td' . $baseRowCellStyle . '>' . $nameHtml . '</td>'
+                    . '<td' . $baseRowCellStyle . '>' . esc($doseFreqText)
                     . ($doseFreqLocal !== '' ? ('<div style="font-size:11px;color:#444;line-height:1.4;" lang="hi">' . esc($doseFreqLocal) . '</div>') : '')
                     . '</td>'
-                    . '<td>' . esc($qty) . '</td>'
-                    . '<td>' . esc($days) . '</td>'
+                    . '<td' . $baseRowCellStyle . '>' . esc($qty) . '</td>'
+                    . '<td' . $baseRowCellStyle . '>' . esc($days) . '</td>'
                     . '</tr>';
 
-                if ($inst !== '' || $instLocal !== '') {
+                if ($hasInstruction) {
                     $medicalHtml .= '<tr>'
                         . '<td></td>'
                         . '<td colspan="4" style="padding-top:2px;padding-bottom:4px;">'
-                        . '<div><strong>Instruction:</strong> ' . esc($inst !== '' ? $inst : '-') . '</div>'
+                        . '<div>' . esc($inst !== '' ? $inst : '-') . '</div>'
                         . ($instLocal !== '' ? ('<div style="font-size:11px;color:#444;line-height:1.4;" lang="hi">' . esc($instLocal) . '</div>') : '')
                         . '</td>'
                         . '</tr>';