diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 589f6d3..ec65cf0 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -470,6 +470,10 @@ $routes->get('Opd/get_appointment_data', 'Opd::get_appointment_data');
 $routes->get('Opd/get_appointment_data/(:segment)', 'Opd::get_appointment_data/$1');
 $routes->get('Opd/get_appointment_list/(:num)', 'Opd::get_appointment_list/$1');
 $routes->get('Opd/get_appointment_list/(:num)/(:segment)', 'Opd::get_appointment_list/$1/$2');
+$routes->get('Opd/get_appointment_digest/(:num)', 'Opd::get_appointment_digest/$1');
+$routes->get('Opd/get_appointment_digest/(:num)/(:segment)', 'Opd::get_appointment_digest/$1/$2');
+$routes->get('Opd/get_appointment_live_rows/(:num)', 'Opd::get_appointment_live_rows/$1');
+$routes->get('Opd/get_appointment_live_rows/(:num)/(:segment)', 'Opd::get_appointment_live_rows/$1/$2');
 $routes->match(['get', 'post'], 'Opd/opd_status/(:num)/(:num)', 'Opd::opd_status/$1/$2');
 $routes->post('Opd/showfee', 'Opd::showfee');
 $routes->post('Opd/confirm_opd', 'Opd::confirm_opd');
diff --git a/app/Controllers/Opd.php b/app/Controllers/Opd.php
index dece6ef..ada146b 100644
--- a/app/Controllers/Opd.php
+++ b/app/Controllers/Opd.php
@@ -934,6 +934,202 @@ class Opd extends BaseController
         ]);
     }
 
+    /**
+     * Lightweight digest endpoint for live appointment screen refresh checks.
+     */
+    public function get_appointment_digest(int $docId, string $opdDate = '')
+    {
+        if (! $this->canAccessDoctorWorkPanel()) {
+            return $this->response->setStatusCode(403)->setJSON([
+                'ok' => 0,
+                'message' => 'Access denied',
+            ]);
+        }
+
+        if ($opdDate === '') {
+            $opdDate = date('Y-m-d');
+        }
+
+        $docId = (int) $docId;
+        $opdDateSql = $this->db->escape($opdDate);
+
+        $sql = "select
+                count(*) as total_rows,
+                sum(case when o.opd_status = 1 and pr.id is null then 1 else 0 end) as count_booking,
+                sum(case when o.opd_status = 1 and pr.id is not null then 1 else 0 end) as count_wait,
+                sum(case when o.opd_status = 2 then 1 else 0 end) as count_visit,
+                sum(case when o.opd_status = 3 then 1 else 0 end) as count_cancel,
+                coalesce(
+                    bit_xor(
+                        cast(
+                            crc32(
+                                concat_ws('|',
+                                    o.opd_id,
+                                    o.opd_status,
+                                    if(pr.id is null, 0, 1),
+                                    if(
+                                        coalesce(trim(pr.pulse),'')<>''
+                                        or coalesce(trim(pr.spo2),'')<>''
+                                        or coalesce(trim(pr.bp),'')<>''
+                                        or coalesce(trim(pr.diastolic),'')<>''
+                                        or coalesce(trim(pr.temp),'')<>''
+                                        or coalesce(trim(pr.rr_min),'')<>''
+                                        or coalesce(trim(pr.height),'')<>''
+                                        or coalesce(trim(pr.weight),'')<>''
+                                        or coalesce(trim(pr.waist),'')<>'',
+                                        1,0
+                                    ),
+                                    coalesce(pr.queue_no,0),
+                                    coalesce(o.payment_status,0),
+                                    coalesce(o.confirm_pay_opd,'')
+                                )
+                            ) as unsigned
+                        )
+                    ),
+                    0
+                ) as digest_crc
+            from opd_master o
+            left join opd_prescription pr on o.opd_id = pr.opd_id
+            where o.apointment_date = " . $opdDateSql . " and o.doc_id = " . $docId;
+
+        $row = $this->db->query($sql)->getRow();
+
+        $payload = [
+            'doc_id' => $docId,
+            'opd_date' => $opdDate,
+            'total' => (int) ($row->total_rows ?? 0),
+            'booked' => (int) ($row->count_booking ?? 0),
+            'waiting' => (int) ($row->count_wait ?? 0),
+            'visited' => (int) ($row->count_visit ?? 0),
+            'cancelled' => (int) ($row->count_cancel ?? 0),
+            'crc' => (string) ($row->digest_crc ?? '0'),
+        ];
+
+        $digest = sha1(json_encode($payload));
+
+        return $this->response->setJSON([
+            'ok' => 1,
+            'digest' => $digest,
+            'payload' => $payload,
+            'server_time' => date('c'),
+        ]);
+    }
+
+    /**
+     * Live snapshot endpoint for in-place row merge on OPD appointment screen.
+     */
+    public function get_appointment_live_rows(int $docId, string $opdDate = '')
+    {
+        if (! $this->canAccessDoctorWorkPanel()) {
+            return $this->response->setStatusCode(403)->setJSON([
+                'ok' => 0,
+                'message' => 'Access denied',
+            ]);
+        }
+
+        if ($opdDate === '') {
+            $opdDate = date('Y-m-d');
+        }
+
+        $docId = (int) $docId;
+        $opdDateSql = $this->db->escape($opdDate);
+
+        $sql = "select
+                o.opd_id,
+                o.opd_status,
+                o.payment_status,
+                o.opd_fee_type,
+                o.opd_fee_amount,
+                o.opd_fee_desc,
+                coalesce(o.running_opd,0) as running_opd,
+                o.confirm_pay_opd,
+                if(pr.id is null, 0, 1) as has_prescription,
+                if(
+                    coalesce(trim(pr.pulse),'')<>''
+                    or coalesce(trim(pr.spo2),'')<>''
+                    or coalesce(trim(pr.bp),'')<>''
+                    or coalesce(trim(pr.diastolic),'')<>''
+                    or coalesce(trim(pr.temp),'')<>''
+                    or coalesce(trim(pr.rr_min),'')<>''
+                    or coalesce(trim(pr.height),'')<>''
+                    or coalesce(trim(pr.weight),'')<>''
+                    or coalesce(trim(pr.waist),'')<>'',
+                    1,0
+                ) as has_vitals,
+                coalesce(pr.queue_no,0) as queue_no
+            from opd_master o
+            left join opd_prescription pr on o.opd_id = pr.opd_id
+            where o.apointment_date = " . $opdDateSql . " and o.doc_id = " . $docId;
+
+        $rows = $this->db->query($sql)->getResult();
+
+        $normalized = [];
+        $counts = [
+            'all' => 0,
+            'booked' => 0,
+            'waiting' => 0,
+            'visited' => 0,
+            'cancelled' => 0,
+        ];
+
+        foreach ($rows as $row) {
+            $status = (int) ($row->opd_status ?? 0);
+            $hasPrescription = (int) ($row->has_prescription ?? 0) === 1;
+            $paymentStatus = (int) ($row->payment_status ?? 0);
+            $runningOpd = (int) ($row->running_opd ?? 0) === 1;
+            $opdFeeType = (int) ($row->opd_fee_type ?? 0);
+            $opdFeeAmount = (float) ($row->opd_fee_amount ?? 0);
+            $opdFeeDesc = strtoupper(trim((string) ($row->opd_fee_desc ?? '')));
+            $isRunningVisit = $runningOpd || $opdFeeType === 3 || str_contains($opdFeeDesc, 'RUNNING');
+            $isConfirmedZeroAmount = $isRunningVisit && $opdFeeAmount <= 0;
+            $isConfirmedForQueue = $paymentStatus === 1 || $isConfirmedZeroAmount || !empty($row->confirm_pay_opd);
+
+            $statusLabel = 'booked';
+            if ($status === 1 && ($hasPrescription || $isConfirmedForQueue)) {
+                $statusLabel = 'waiting';
+            } elseif ($status === 2) {
+                $statusLabel = 'visited';
+            } elseif ($status === 3) {
+                $statusLabel = 'cancelled';
+            }
+
+            $normalized[] = [
+                'opd_id' => (int) ($row->opd_id ?? 0),
+                'status' => $statusLabel,
+                'has_prescription' => $hasPrescription ? 1 : 0,
+                'has_vitals' => (int) ($row->has_vitals ?? 0),
+                'queue_no' => (int) ($row->queue_no ?? 0),
+                'is_confirmed_for_queue' => $isConfirmedForQueue ? 1 : 0,
+            ];
+
+            $counts['all']++;
+            if (array_key_exists($statusLabel, $counts)) {
+                $counts[$statusLabel]++;
+            }
+        }
+
+        usort($normalized, static function ($left, $right): int {
+            return ((int) ($left['opd_id'] ?? 0)) <=> ((int) ($right['opd_id'] ?? 0));
+        });
+
+        $digest = sha1(json_encode([
+            'doc_id' => $docId,
+            'opd_date' => $opdDate,
+            'counts' => $counts,
+            'rows' => $normalized,
+        ]));
+
+        return $this->response->setJSON([
+            'ok' => 1,
+            'digest' => $digest,
+            'doc_id' => $docId,
+            'opd_date' => $opdDate,
+            'counts' => $counts,
+            'rows' => $normalized,
+            'server_time' => date('c'),
+        ]);
+    }
+
     /**
      * Update OPD status from queue actions.
      */
@@ -3749,6 +3945,8 @@ class Opd extends BaseController
 
             $this->db->table('opd_master')->where('opd_id', $oid)->update($data);
 
+            $this->autoCreateOpdQueue($oid);
+
             return $this->response->setJSON([
                 'update' => 1,
                 'showcontent' => 'Zero Cost',
@@ -3785,6 +3983,8 @@ class Opd extends BaseController
 
             $this->db->table('opd_master')->where('opd_id', $oid)->update($data);
 
+            $this->autoCreateOpdQueue($oid);
+
             return $this->response->setJSON([
                 'update' => 1,
                 'showcontent' => 'CASH',
@@ -3832,6 +4032,8 @@ class Opd extends BaseController
 
             $this->db->table('opd_master')->where('opd_id', $oid)->update($data);
 
+            $this->autoCreateOpdQueue($oid);
+
             return $this->response->setJSON([
                 'update' => 1,
                 'showcontent' => 'Bank Card',
@@ -3852,6 +4054,8 @@ class Opd extends BaseController
 
             $this->db->table('opd_master')->where('opd_id', $oid)->update($data);
 
+            $this->autoCreateOpdQueue($oid);
+
             return $this->response->setJSON([
                 'update' => 1,
                 'showcontent' => 'Org. Case Credit',
@@ -3868,6 +4072,64 @@ class Opd extends BaseController
         ]);
     }
 
+    private function autoCreateOpdQueue(int $opdId): void
+    {
+        if ($opdId <= 0 || ! $this->db->tableExists('opd_prescription')) {
+            return;
+        }
+
+        // If a queue row already exists for this OPD, do nothing.
+        $existing = $this->db->table('opd_prescription')
+            ->where('opd_id', $opdId)
+            ->get(1)
+            ->getRow();
+        if ($existing) {
+            return;
+        }
+
+        $opdRow = $this->db->table('opd_master')
+            ->where('opd_id', $opdId)
+            ->get(1)
+            ->getRow();
+        if (! $opdRow) {
+            return;
+        }
+
+        $fields = $this->db->getFieldNames('opd_prescription');
+        $insert = [];
+        if (in_array('opd_id', $fields, true)) {
+            $insert['opd_id'] = $opdId;
+        }
+        if (in_array('p_id', $fields, true)) {
+            $insert['p_id'] = (int) ($opdRow->p_id ?? 0);
+        }
+        if (in_array('doc_id', $fields, true)) {
+            $insert['doc_id'] = (int) ($opdRow->doc_id ?? 0);
+        }
+        if (in_array('date_opd_visit', $fields, true)) {
+            $insert['date_opd_visit'] = date('Y-m-d');
+        }
+        if (in_array('visit_status', $fields, true)) {
+            $insert['visit_status'] = 0;
+        }
+        if (in_array('session_id', $fields, true)) {
+            $insert['session_id'] = 0;
+        }
+        if (in_array('queue_no', $fields, true)) {
+            $maxQueue = $this->db->table('opd_prescription')
+                ->selectMax('queue_no', 'max_queue')
+                ->where('date_opd_visit', date('Y-m-d'))
+                ->where('doc_id', (int) ($opdRow->doc_id ?? 0))
+                ->get()
+                ->getRow();
+            $insert['queue_no'] = (int) ($maxQueue->max_queue ?? 0) + 1;
+        }
+
+        if (! empty($insert)) {
+            $this->db->table('opd_prescription')->insert($insert);
+        }
+    }
+
     public function opd_discount_update(int $opdId)
     {
         if (!$this->request->isAJAX()) {
diff --git a/app/Controllers/Patient.php b/app/Controllers/Patient.php
index 8cdf39e..a6ef966 100644
--- a/app/Controllers/Patient.php
+++ b/app/Controllers/Patient.php
@@ -192,37 +192,62 @@ class Patient extends BaseController
 	{
 		$inputMphone1 = trim((string) $this->request->getPost('input_mphone1'));
 		$inputAadhar = trim((string) $this->request->getPost('input_udai'));
+		$inputAbhaId = trim((string) $this->request->getPost('input_abha_id'));
 		$inputRelativeName = trim((string) $this->request->getPost('input_relative_name'));
 		$inputName = trim((string) $this->request->getPost('input_name'));
+		$abhaField = $this->resolvePatientAbhaIdField();
 
 		$builder = $this->db->table('patient_master');
-		$builder->select("id, CONCAT(p_fname,'/',IF(gender=1,'M','F'),'/',p_relative,' ',p_rname) AS Sresult");
+		$builder->select("id,p_fname,p_relative,p_rname,gender,add1,city,district,state,zip,mphone1,udai,last_visit,dob,age,age_in_month,estimate_dob");
+		if ($abhaField !== null) {
+			$builder->select($abhaField . ' AS abha_id');
+		}
 
 		$hasCondition = false;
-		if ($inputMphone1 !== '') {
-			$builder->orWhere('mphone1', $inputMphone1);
-			$hasCondition = true;
-		}
+		if ($inputMphone1 !== '' || $inputAadhar !== '' || $inputAbhaId !== '' || ($inputRelativeName !== '' && $inputName !== '')) {
+			$builder->groupStart();
 
-		if ($inputAadhar !== '') {
-			$builder->orWhere('udai', $inputAadhar);
-			$hasCondition = true;
-		}
+			if ($inputMphone1 !== '') {
+				$builder->where('mphone1', $inputMphone1);
+				$hasCondition = true;
+			}
 
-		if ($inputRelativeName !== '') {
-			$builder->groupStart()
-				->where('p_rname', $inputRelativeName)
-				->where('p_fname', $inputName)
-				->groupEnd();
-			$hasCondition = true;
+			if ($inputAadhar !== '') {
+				$builder->orWhere('udai', $inputAadhar);
+				$hasCondition = true;
+			}
+
+			if ($inputAbhaId !== '' && $abhaField !== null) {
+				$builder->orWhere($abhaField, $inputAbhaId);
+				$hasCondition = true;
+			}
+
+			if ($inputRelativeName !== '' && $inputName !== '') {
+				$builder->orGroupStart()
+					->where('p_rname', trim(strtoupper($inputRelativeName)))
+					->where('p_fname', trim(strtoupper($inputName)))
+					->groupEnd();
+				$hasCondition = true;
+			}
+
+			$builder->groupEnd();
 		}
 
 		$searchResult = [];
 		if ($hasCondition) {
-			$searchResult = $builder->orderBy('id', 'DESC')->get()->getResult();
+			$searchResult = $builder->orderBy('id', 'DESC')->limit(25)->get()->getResult();
 		}
 
-		return view('billing/search_adv_data', ['search_result' => $searchResult]);
+		return view('billing/search_adv_data', [
+			'search_result' => $searchResult,
+			'filters' => [
+				'input_mphone1' => $inputMphone1,
+				'input_udai' => strtoupper($inputAadhar),
+				'input_abha_id' => $inputAbhaId,
+				'input_relative_name' => strtoupper($inputRelativeName),
+				'input_name' => strtoupper($inputName),
+			],
+		]);
 	}
 
 	public function abha_fetch_profile()
diff --git a/app/Views/billing/Patient_V.php b/app/Views/billing/Patient_V.php
index 8737c91..292eabd 100644
--- a/app/Views/billing/Patient_V.php
+++ b/app/Views/billing/Patient_V.php
@@ -282,6 +282,14 @@
 
         $('#input_abha_id').on('change blur', function() {
             var abhaId = ($(this).val() || '').toString().trim();
+            if (abhaId !== '') {
+                refreshAdvancedSearchResult({
+                    input_abha_id: abhaId
+                });
+            } else {
+                $('#search_result_update').html('');
+            }
+
             if (!/^\d{14}$/.test(abhaId)) {
                 return;
             }
@@ -470,41 +478,36 @@
         };
     }
 
+    function refreshAdvancedSearchResult(payload) {
+        var csrf = getCsrfData();
+        var postData = $.extend({}, payload || {});
+        postData[csrf.name] = csrf.value;
+
+        $.post('<?= base_url('billing/patient/search_adv') ?>', postData, function(data) {
+            $('#search_result_update').html(data);
+        });
+    }
+
     function onchange_feild_number(control_button) {
         var input_mphone1 = $('#input_mphone1').val();
-        var csrf = getCsrfData();
-
-        $.post('<?= base_url('billing/patient/search_adv') ?>', {
-            "input_mphone1": input_mphone1,
-            [csrf.name]: csrf.value
-        }, function(data) {
-            $('#search_result_update').html(data);
+        refreshAdvancedSearchResult({
+            "input_mphone1": input_mphone1
         });
     }
 
     function onchange_aadhar(control_button) {
         var input_udai = $('#input_udai').val();
-        var csrf = getCsrfData();
-
-        $.post('<?= base_url('billing/patient/search_adv') ?>', {
-            "input_udai": input_udai,
-            [csrf.name]: csrf.value
-        }, function(data) {
-            $('#search_result_update').html(data);
+        refreshAdvancedSearchResult({
+            "input_udai": input_udai
         });
     }
 
     function onchange_relative_name(control_button) {
         var input_relative_name = $('#input_relative_name').val();
         var input_name = $('#input_name').val();
-        var csrf = getCsrfData();
-
-        $.post('<?= base_url('billing/patient/search_adv') ?>', {
+        refreshAdvancedSearchResult({
             "input_relative_name": input_relative_name,
-            "input_name": input_name,
-            [csrf.name]: csrf.value
-        }, function(data) {
-            $('#search_result_update').html(data);
+            "input_name": input_name
         });
 
     }
diff --git a/app/Views/billing/opd_appointment_dashboard.php b/app/Views/billing/opd_appointment_dashboard.php
index eba8722..c8a30de 100644
--- a/app/Views/billing/opd_appointment_dashboard.php
+++ b/app/Views/billing/opd_appointment_dashboard.php
@@ -29,9 +29,10 @@
                         </div>
                         <div class="card-body p-0">
                             <table class="table table-sm mb-0">
-                                <tr><td>Booked</td><td class="text-end"><span class="badge bg-secondary\"><?= esc((int) ($row->count_booking ?? 0)) ?></span></td></tr>
-                                <tr><td>Waiting</td><td class="text-end"><span class="badge bg-primary\"><?= esc((int) ($row->count_wait ?? 0)) ?></span></td></tr>
-                                <tr><td>Visited</td><td class="text-end"><span class="badge bg-info\"><?= esc((int) ($row->count_visit ?? 0)) ?></span></td></tr>
+                                <tr><td>Booked</td><td class="text-end"><span class="badge bg-secondary"><?= esc((int) ($row->count_booking ?? 0)) ?></span></td></tr>
+                                <tr><td>Waiting</td><td class="text-end"><span class="badge bg-primary"><?= esc((int) ($row->count_wait ?? 0)) ?></span></td></tr>
+                                <tr><td>Visited</td><td class="text-end"><span class="badge bg-info"><?= esc((int) ($row->count_visit ?? 0)) ?></span></td></tr>
+                                <tr><td>Cancelled</td><td class="text-end"><span class="badge bg-warning text-dark"><?= esc((int) ($row->count_cancel ?? 0)) ?></span></td></tr>
                                 <tr><td>Total</td><td class="text-end"><span class="badge bg-danger"><?= esc($total) ?></span></td></tr>
                             </table>
                         </div>
diff --git a/app/Views/billing/opd_appointment_list.php b/app/Views/billing/opd_appointment_list.php
index e3a6c93..a4dacf8 100644
--- a/app/Views/billing/opd_appointment_list.php
+++ b/app/Views/billing/opd_appointment_list.php
@@ -1,4 +1,34 @@
-<?php $doc = $doc_master[0] ?? null; ?>
+<?php
+$doc = $doc_master[0] ?? null;
+
+$canOpenPrescription = false;
+$authUser = function_exists('auth') ? auth()->user() : null;
+if ($authUser && method_exists($authUser, 'can') && $authUser->can('opd.doctor-panel.access')) {
+    $canOpenPrescription = true;
+}
+
+$countBooked    = (int) ($doc->count_booking ?? 0);
+$countWaiting   = (int) ($doc->count_wait    ?? 0);
+$countVisited   = (int) ($doc->count_visit   ?? 0);
+$countCancelled = (int) ($doc->count_cancel  ?? 0);
+$countAll       = (int) ($doc->No_opd        ?? 0);
+
+// Count waiting patients whose vitals are missing (for badge on filter button)
+$missingVitalsCount = 0;
+foreach (($opd_list_1 ?? []) as $_r) {
+    if ((int) ($_r->has_prescription ?? 0) === 1 && (int) ($_r->has_vitals ?? 0) !== 1) {
+        $missingVitalsCount++;
+    }
+}
+
+// Build merged dataset for the unified table
+$mergedGroups = [
+    ['status' => 'booked',    'label' => 'Booked',    'badge' => 'bg-secondary',        'tabType' => 'booking',   'rows' => ($opd_list_0 ?? [])],
+    ['status' => 'waiting',   'label' => 'Waiting',   'badge' => 'bg-primary',           'tabType' => 'waiting',   'rows' => ($opd_list_1 ?? [])],
+    ['status' => 'visited',   'label' => 'Visited',   'badge' => 'bg-info text-dark',   'tabType' => 'visited',   'rows' => ($opd_list_2 ?? [])],
+    ['status' => 'cancelled', 'label' => 'Cancelled', 'badge' => 'bg-danger',            'tabType' => 'cancelled', 'rows' => ($opd_list_3 ?? [])],
+];
+?>
 <section class="content-header">
     <div class="d-flex justify-content-between align-items-center">
         <h3 class="mb-0">Dr. <?= esc($doc->p_fname ?? '') ?> <small class="text-muted"><?= esc($doc->Spec ?? '') ?></small></h3>
@@ -7,42 +37,128 @@
 </section>
 
 <section class="content">
-    <div class="row mb-2">
-        <div class="col-md-2"><strong>Booked :</strong> <?= esc((int) ($doc->count_booking ?? 0)) ?></div>
-        <div class="col-md-2"><strong>Waiting :</strong> <?= esc((int) ($doc->count_wait ?? 0)) ?></div>
-        <div class="col-md-2"><strong>Visited :</strong> <?= esc((int) ($doc->count_visit ?? 0)) ?></div>
-        <div class="col-md-2"><strong>Cancelled :</strong> <?= esc((int) ($doc->count_cancel ?? 0)) ?></div>
-        <div class="col-md-2"><strong>Total :</strong> <?= esc((int) ($doc->No_opd ?? 0)) ?></div>
-    </div>
-
-    <ul class="nav nav-tabs" id="opdQueueTabs" role="tablist">
-        <li class="nav-item"><button class="nav-link active" data-bs-toggle="tab" data-bs-target="#tab_booking" type="button">Booked</button></li>
-        <li class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#tab_waiting" type="button">Waiting <span id="waitingMissingBadge" class="badge rounded-pill bg-warning text-dark ms-1 d-none" role="button" title="Show only patients with missing vitals">0</span></button></li>
-        <li class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#tab_visited" type="button">Visited</button></li>
-        <li class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#tab_cancelled" type="button">Cancelled</button></li>
-    </ul>
-
-    <div class="tab-content border border-top-0 p-2 bg-white" id="opdQueueTabContent">
-        <div class="tab-pane fade show active" id="tab_booking">
-            <?= view('billing/opd_appointment_list_table', ['rows' => $opd_list_0, 'showQueue' => false, 'tabType' => 'booking', 'opd_date' => $opd_date, 'doc_id' => $doc_id]) ?>
+    <!-- Filter buttons + Missing Vitals toggle -->
+    <div class="d-flex flex-wrap align-items-center gap-2 mb-3">
+        <div class="btn-group" role="group" aria-label="Filter by status">
+            <button type="button" class="btn btn-sm btn-outline-secondary active btn-opd-filter" data-filter="">
+                All <span id="countBadgeAll" class="badge bg-secondary ms-1"><?= $countAll ?></span>
+            </button>
+            <button type="button" class="btn btn-sm btn-outline-secondary btn-opd-filter" data-filter="booked">
+                Booked <span id="countBadgeBooked" class="badge bg-secondary ms-1"><?= $countBooked ?></span>
+            </button>
+            <button type="button" class="btn btn-sm btn-outline-primary btn-opd-filter" data-filter="waiting">
+                Waiting <span id="countBadgeWaiting" class="badge bg-primary ms-1"><?= $countWaiting ?></span>
+                <span id="waitingMissingBadge" class="badge rounded-pill bg-warning text-dark ms-1<?= $missingVitalsCount > 0 ? '' : ' d-none' ?>" title="<?= $missingVitalsCount ?> patient(s) missing vitals"><?= $missingVitalsCount ?></span>
+            </button>
+            <button type="button" class="btn btn-sm btn-outline-info btn-opd-filter" data-filter="visited">
+                Visited <span id="countBadgeVisited" class="badge bg-info text-dark ms-1"><?= $countVisited ?></span>
+            </button>
+            <button type="button" class="btn btn-sm btn-outline-danger btn-opd-filter" data-filter="cancelled">
+                Cancelled <span id="countBadgeCancelled" class="badge bg-danger ms-1"><?= $countCancelled ?></span>
+            </button>
         </div>
-        <div class="tab-pane fade" id="tab_waiting">
-            <div class="d-flex justify-content-end mb-2">
-                <div class="form-check form-switch">
-                    <input class="form-check-input" type="checkbox" id="toggle_missing_vitals_only">
-                    <label class="form-check-label" for="toggle_missing_vitals_only">Only Missing Vitals</label>
-                </div>
-            </div>
-            <?= view('billing/opd_appointment_list_table', ['rows' => $opd_list_1, 'showQueue' => true, 'tabType' => 'waiting', 'tableId' => 'opdWaitingTable', 'opd_date' => $opd_date, 'doc_id' => $doc_id]) ?>
-            <div id="waitingNoRowsHint" class="small text-muted mt-2 d-none">All waiting patients already have vitals.</div>
-        </div>
-        <div class="tab-pane fade" id="tab_visited">
-            <?= view('billing/opd_appointment_list_table', ['rows' => $opd_list_2, 'showQueue' => true, 'tabType' => 'visited', 'tableId' => 'opdVisitedTable', 'opd_date' => $opd_date, 'doc_id' => $doc_id]) ?>
-        </div>
-        <div class="tab-pane fade" id="tab_cancelled">
-            <?= view('billing/opd_appointment_list_table', ['rows' => $opd_list_3, 'showQueue' => true, 'tabType' => 'cancelled', 'opd_date' => $opd_date, 'doc_id' => $doc_id]) ?>
+        <div class="form-check form-switch ms-auto">
+            <input class="form-check-input" type="checkbox" id="toggle_missing_vitals_only">
+            <label class="form-check-label small" for="toggle_missing_vitals_only">Only Missing Vitals</label>
         </div>
     </div>
+
+    <!-- Single unified table -->
+    <div class="table-responsive">
+        <table class="table table-sm table-striped align-middle mb-0" id="opdAllTable">
+            <thead>
+            <tr>
+                <th>Status</th>
+                <th>OPD No.</th>
+                <th>Current Patient</th>
+                <th>Q No.</th>
+                <th>UHID</th>
+                <th>OPD Type</th>
+                <th>Action</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($mergedGroups as $group) : ?>
+                <?php foreach ($group['rows'] as $row) : ?>
+                    <?php
+                    $hasVitals          = (int) ($row->has_vitals          ?? 0) === 1;
+                    $hasPrescription    = (int) ($row->has_prescription    ?? 0) === 1;
+                    $isConfirmedForQueue= (int) ($row->is_confirmed_for_queue ?? 0) === 1;
+                    $queueNo            = (int) ($row->queue_no ?? 0);
+                    $hasQueueNo         = $queueNo > 0;
+                    $showFullActions    = $hasPrescription || $isConfirmedForQueue;
+                    $opdId              = (int) ($row->opd_id ?? 0);
+                    $patientName        = esc(($row->P_name ?? '') . ' { ' . ($row->p_rname ?? '') . ' }');
+                    $tabType            = $group['tabType'];
+                    $status             = $group['status'];
+                    ?>
+                    <tr data-opd-id="<?= $opdId ?>"
+                        data-opd-status="<?= esc($status) ?>"
+                        data-has-vitals="<?= (int) ($row->has_vitals ?? 0) ?>"
+                        data-has-prescription="<?= $showFullActions ? 1 : 0 ?>">
+                        <td><span class="badge <?= esc($group['badge']) ?>"><?= esc($group['label']) ?></span></td>
+                        <td><?= esc($row->opd_code ?? '') ?></td>
+                        <td><?= $patientName ?></td>
+                        <td data-order="<?= $hasQueueNo ? $queueNo : 9999 ?>"><?= $hasQueueNo ? $queueNo : '' ?></td>
+                        <td><?= esc($row->p_code ?? '') ?></td>
+                        <td><?= esc($row->opd_type ?? '') ?> / Amt: <?= esc($row->opd_fee_amount ?? '') ?></td>
+                        <td>
+                            <?php if ($tabType === 'booking') : ?>
+                                <?php if ($isConfirmedForQueue) : ?>
+                                    <button type="button" class="btn btn-outline-success btn-sm btn-opd-create-queue" data-opdid="<?= $opdId ?>" title="Add to Queue">
+                                        Queue
+                                    </button>
+                                <?php else : ?>
+                                    <a class="btn btn-outline-primary btn-sm" href="javascript:load_form('/Opd/invoice/<?= $opdId ?>','OPD Invoice');">
+                                        Go For Payment
+                                    </a>
+                                <?php endif; ?>
+                            <?php else : ?>
+                                <?php if (!$hasQueueNo) : ?>
+                                    <button type="button" class="btn btn-outline-success btn-sm btn-opd-create-queue" data-opdid="<?= $opdId ?>" title="Add to Queue">
+                                        Queue
+                                    </button>
+                                <?php endif; ?>
+                                <?php if ($canOpenPrescription && $showFullActions) : ?>
+                                    <a class="btn btn-outline-primary btn-sm" href="javascript:load_form('/Opd_prescription/Prescription/<?= $opdId ?>','Consult');">
+                                        Consult
+                                    </a>
+                                <?php endif; ?>
+                                <?php if ($showFullActions) : ?>
+                                    <button type="button"
+                                            class="btn <?= $hasVitals ? 'btn-success' : 'btn-warning text-dark' ?> btn-sm btn-opd-vitals"
+                                            title="<?= $hasVitals ? 'Vitals Filled' : 'Vitals' ?>"
+                                            data-opdid="<?= $opdId ?>"
+                                            data-patient="<?= $patientName ?>">
+                                        <?= $hasVitals ? 'Vitals ✓' : 'Vitals' ?>
+                                    </button>
+                                <?php endif; ?>
+                                <button type="button" class="btn btn-outline-info btn-sm btn-opd-scan" title="Scan" data-opdid="<?= $opdId ?>">Scan</button>
+                                <button type="button" class="btn btn-outline-secondary btn-sm btn-opd-scan" title="Upload Scan" data-opdid="<?= $opdId ?>">Upload</button>
+                                <button type="button" class="btn btn-outline-dark btn-sm btn-opd-scan-list" title="Scan Doc List" data-opdid="<?= $opdId ?>">Scan Doc List</button>
+                                <?php if ($tabType === 'waiting' && $showFullActions) : ?>
+                                    <button type="button" class="btn btn-outline-success btn-sm btn-opd-status"
+                                            data-opd-id="<?= $opdId ?>" data-opd-status="2" title="Visit Done">
+                                        Visit Done
+                                    </button>
+                                <?php elseif ($tabType === 'visited') : ?>
+                                    <button type="button" class="btn btn-success btn-sm btn-opd-status"
+                                            data-opd-id="<?= $opdId ?>" data-opd-status="2" title="Visit Done">
+                                        Visit Done
+                                    </button>
+                                <?php endif; ?>
+                            <?php endif; ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            <?php endforeach; ?>
+            <?php if ($countAll === 0) : ?>
+                <tr><td colspan="7" class="text-muted text-center py-3">No OPD records found for this date.</td></tr>
+            <?php endif; ?>
+            </tbody>
+        </table>
+    </div>
+    <div id="waitingNoRowsHint" class="small text-muted mt-2 d-none">All waiting patients already have vitals.</div>
 </section>
 
 <div class="modal fade" id="tallModal" tabindex="-1" aria-hidden="true">
@@ -96,13 +212,19 @@
 
 <script>
 (function() {
-    // Reusable Bootstrap modal instances for scan and vitals dialogs.
     var modalEl = document.getElementById('tallModal');
     var modalObj = modalEl ? new bootstrap.Modal(modalEl) : null;
     var vitalsModalEl = document.getElementById('vitalsModal');
     var vitalsModalObj = vitalsModalEl ? new bootstrap.Modal(vitalsModalEl) : null;
-    var waitingDataTable = null;
-    var visitedDataTable = null;
+    var opdDataTable = null;
+    var activeStatusFilter = '';
+    var canOpenPrescription = <?= $canOpenPrescription ? 'true' : 'false' ?>;
+    var isUserUpdateInProgress = false;
+    var liveDigest = '';
+    var livePollInFlight = false;
+    var livePollMs = 8000;
+    var liveDigestUrl = '/Opd/get_appointment_digest/<?= esc((int) ($doc_id ?? 0)) ?>/<?= esc($opd_date ?? date('Y-m-d')) ?>';
+    var liveRowsUrl = '/Opd/get_appointment_live_rows/<?= esc((int) ($doc_id ?? 0)) ?>/<?= esc($opd_date ?? date('Y-m-d')) ?>';
 
     function getCsrfPair() {
         var input = document.querySelector('input[name="<?= csrf_token() ?>"]');
@@ -122,46 +244,21 @@
         }
     }
 
-    function destroyDataTable(selector) {
-        if (!window.jQuery || !$.fn || !$.fn.DataTable || !$.fn.DataTable.isDataTable(selector)) {
-            return null;
-        }
-
-        return $(selector).DataTable().destroy();
-    }
-
-    function hasActualRows(selector) {
-        var $table = $(selector);
-        if ($table.length === 0) {
-            return false;
-        }
-
-        var $rows = $table.find('tbody tr');
-        if ($rows.length === 0) {
-            return false;
-        }
-
-        return $table.find('tbody tr td:not([colspan])').length > 0;
-    }
-
-    function registerWaitingVitalsFilter() {
+    // --- DataTable status + missing-vitals custom search filter ---
+    function registerOpdTableFilter() {
         if (!window.jQuery || !$.fn || !$.fn.dataTable) {
             return;
         }
 
-        if (window.opdWaitingVitalsFilter) {
-            var existingIndex = $.fn.dataTable.ext.search.indexOf(window.opdWaitingVitalsFilter);
+        if (window.opdTableFilter) {
+            var existingIndex = $.fn.dataTable.ext.search.indexOf(window.opdTableFilter);
             if (existingIndex >= 0) {
                 $.fn.dataTable.ext.search.splice(existingIndex, 1);
             }
         }
 
-        window.opdWaitingVitalsFilter = function(settings, data, dataIndex) {
-            if (!settings || !settings.nTable || settings.nTable.id !== 'opdWaitingTable') {
-                return true;
-            }
-
-            if (!$('#toggle_missing_vitals_only').is(':checked')) {
+        window.opdTableFilter = function(settings, data, dataIndex) {
+            if (!settings || !settings.nTable || settings.nTable.id !== 'opdAllTable') {
                 return true;
             }
 
@@ -170,77 +267,170 @@
                 return true;
             }
 
-            if (parseInt($(rowNode).attr('data-has-prescription') || '0', 10) !== 1) {
+            var $row = $(rowNode);
+            var rowStatus = ($row.attr('data-opd-status') || '').toLowerCase();
+
+            // Status tab filter
+            if (activeStatusFilter && rowStatus !== activeStatusFilter) {
                 return false;
             }
 
-            return parseInt($(rowNode).attr('data-has-vitals') || '0', 10) !== 1;
+            // "Only Missing Vitals" secondary filter
+            if ($('#toggle_missing_vitals_only').is(':checked')) {
+                if (rowStatus !== 'waiting') {
+                    return false;
+                }
+                var hasVitals = parseInt($row.attr('data-has-vitals') || '0', 10) === 1;
+                var hasPrescription = parseInt($row.attr('data-has-prescription') || '0', 10) === 1;
+                if (!hasPrescription || hasVitals) {
+                    return false;
+                }
+            }
+
+            return true;
         };
 
-        $.fn.dataTable.ext.search.push(window.opdWaitingVitalsFilter);
+        $.fn.dataTable.ext.search.push(window.opdTableFilter);
     }
 
-    function initializeOpdTable(selector, options) {
+    function initializeOpdTable() {
         if (!window.jQuery || !$.fn || !$.fn.DataTable) {
             return null;
         }
 
-        destroyDataTable(selector);
-
-        if (!hasActualRows(selector)) {
-            return null;
+        if ($.fn.DataTable.isDataTable('#opdAllTable')) {
+            $('#opdAllTable').DataTable().destroy();
         }
 
-        return $(selector).DataTable($.extend({
+        return $('#opdAllTable').DataTable({
             paging: true,
-            lengthChange: false,
+            lengthChange: true,
             searching: true,
             ordering: true,
             info: true,
             autoWidth: false,
-            responsive: true,
-            pageLength: 25
-        }, options || {}));
+            responsive: false,
+            pageLength: 25,
+            order: [[1, 'asc']],
+            columnDefs: [
+                { targets: [0], searchable: false },
+                { targets: [6], orderable: false, searchable: false }
+            ]
+        });
     }
 
     function syncWaitingHintAndBadge() {
-        var $rows = $('#tab_waiting tbody tr[data-opd-id]');
+        var $waitingRows = $('#opdAllTable tbody tr[data-opd-status="waiting"]');
         var missingCount = 0;
-        var visibleCount = 0;
 
-        $rows.each(function() {
+        $waitingRows.each(function() {
             var hasVitals = parseInt($(this).attr('data-has-vitals') || '0', 10) === 1;
             var hasPrescription = parseInt($(this).attr('data-has-prescription') || '0', 10) === 1;
             if (hasPrescription && !hasVitals) {
                 missingCount++;
             }
-
-            if ($(this).is(':visible')) {
-                visibleCount++;
-            }
         });
 
         var $badge = $('#waitingMissingBadge');
         $badge.text(String(missingCount));
         $badge.toggleClass('d-none', missingCount <= 0);
 
-        $('#waitingNoRowsHint').toggleClass('d-none', !($('#toggle_missing_vitals_only').is(':checked') && $rows.length > 0 && visibleCount === 0));
+        var onlyMissing = $('#toggle_missing_vitals_only').is(':checked');
+        $('#waitingNoRowsHint').toggleClass('d-none', !(onlyMissing && $waitingRows.length > 0 && missingCount === 0));
     }
 
-    function initializeOpdTables() {
-        registerWaitingVitalsFilter();
+    function recalcStatusCounts() {
+        var counts = {
+            all: 0,
+            booked: 0,
+            waiting: 0,
+            visited: 0,
+            cancelled: 0
+        };
 
-        waitingDataTable = initializeOpdTable('#opdWaitingTable', {
-            order: [[2, 'asc']],
-            drawCallback: function() {
-                syncWaitingHintAndBadge();
+        $('#opdAllTable tbody tr[data-opd-id]').each(function() {
+            var status = (($(this).attr('data-opd-status') || '').toLowerCase());
+            counts.all += 1;
+            if (Object.prototype.hasOwnProperty.call(counts, status)) {
+                counts[status] += 1;
             }
         });
 
-        visitedDataTable = initializeOpdTable('#opdVisitedTable', {
-            order: [[2, 'asc']]
-        });
+        $('#countBadgeAll').text(String(counts.all));
+        $('#countBadgeBooked').text(String(counts.booked));
+        $('#countBadgeWaiting').text(String(counts.waiting));
+        $('#countBadgeVisited').text(String(counts.visited));
+        $('#countBadgeCancelled').text(String(counts.cancelled));
+    }
 
+    function applyStatusVisual($row, status) {
+        var $statusBadge = $row.find('td:first .badge');
+        if (!$statusBadge.length) {
+            return;
+        }
+
+        $statusBadge.removeClass('bg-secondary bg-primary bg-info bg-danger text-dark');
+
+        if (status === 'waiting') {
+            $statusBadge.addClass('bg-primary').text('Waiting');
+            return;
+        }
+
+        if (status === 'visited') {
+            $statusBadge.addClass('bg-info text-dark').text('Visited');
+            return;
+        }
+
+        if (status === 'cancelled') {
+            $statusBadge.addClass('bg-danger').text('Cancelled');
+            return;
+        }
+
+        $statusBadge.addClass('bg-secondary').text('Booked');
+    }
+
+    function ensureWaitingActionButtons($row, opdId) {
+        var $actionCell = $row.find('td').eq(6);
+        var patient = ($row.find('td').eq(2).text() || '').trim();
+
+        $actionCell.find('.btn-opd-create-queue').remove();
+
+        if (canOpenPrescription && $actionCell.find('.btn-opd-consult-open, a[title="Consult"]').length === 0) {
+            var $consultBtn = $('<button type="button" class="btn btn-outline-primary btn-sm btn-opd-consult-open">Consult</button>');
+            $consultBtn.attr('data-opdid', opdId);
+            $actionCell.append($consultBtn).append(' ');
+        }
+
+        if ($actionCell.find('.btn-opd-vitals').length === 0) {
+            var $vitalsBtn = $('<button type="button" class="btn btn-warning text-dark btn-sm btn-opd-vitals" title="Vitals">Vitals</button>');
+            $vitalsBtn.attr('data-opdid', opdId);
+            $vitalsBtn.attr('data-patient', patient);
+            $actionCell.append($vitalsBtn).append(' ');
+        }
+
+        if ($actionCell.find('.btn-opd-scan[title="Scan"]').length === 0) {
+            $actionCell.append('<button type="button" class="btn btn-outline-info btn-sm btn-opd-scan" title="Scan" data-opdid="' + opdId + '">Scan</button> ');
+        }
+
+        if ($actionCell.find('.btn-opd-scan[title="Upload Scan"]').length === 0) {
+            $actionCell.append('<button type="button" class="btn btn-outline-secondary btn-sm btn-opd-scan" title="Upload Scan" data-opdid="' + opdId + '">Upload</button> ');
+        }
+
+        if ($actionCell.find('.btn-opd-scan-list').length === 0) {
+            $actionCell.append('<button type="button" class="btn btn-outline-dark btn-sm btn-opd-scan-list" title="Scan Doc List" data-opdid="' + opdId + '">Scan Doc List</button> ');
+        }
+
+        if ($actionCell.find('.btn-opd-status').length === 0) {
+            $actionCell.append('<button type="button" class="btn btn-outline-success btn-sm btn-opd-status" data-opd-id="' + opdId + '" data-opd-status="2" title="Visit Done">Visit Done</button>');
+        } else {
+            $actionCell.find('.btn-opd-status').removeClass('btn-success').addClass('btn-outline-success').attr('data-opd-status', '2').attr('title', 'Visit Done').text('Visit Done');
+        }
+    }
+
+    function applyFilters() {
+        if (opdDataTable) {
+            opdDataTable.draw();
+        }
         syncWaitingHintAndBadge();
     }
 
@@ -248,6 +438,160 @@
         load_form('/Opd/get_appointment_list/<?= esc((int) ($doc_id ?? 0)) ?>/<?= esc($opd_date ?? date('Y-m-d')) ?>', 'OPD Appointment List');
     }
 
+    function shouldSkipLiveCheck() {
+        if (document.hidden) {
+            return true;
+        }
+
+        if (isUserUpdateInProgress) {
+            return true;
+        }
+
+        if ($('#tallModal').hasClass('show') || $('#vitalsModal').hasClass('show')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function checkLiveUpdates() {
+        if (livePollInFlight || shouldSkipLiveCheck()) {
+            return;
+        }
+
+        livePollInFlight = true;
+        $.getJSON(liveDigestUrl, function(resp) {
+            if (!resp || parseInt(resp.ok || 0, 10) !== 1) {
+                return;
+            }
+
+            if (!liveDigest) {
+                liveDigest = String(resp.digest || '');
+                return;
+            }
+
+            if (liveDigest !== String(resp.digest || '')) {
+                mergeLiveRowsOrReload();
+                return;
+            }
+        }).always(function() {
+            livePollInFlight = false;
+        });
+    }
+
+    function updateQueueCell($row, queueNo) {
+        var qNo = parseInt(queueNo || '0', 10);
+        var $queueCell = $row.find('td').eq(3);
+        $queueCell.attr('data-order', qNo > 0 ? qNo : 9999);
+        $queueCell.text(qNo > 0 ? String(qNo) : '');
+    }
+
+    function updateVitalsButtonState($row, hasPrescription, hasVitals) {
+        var $btn = $row.find('.btn-opd-vitals').first();
+        if (!$btn.length || parseInt(hasPrescription || 0, 10) !== 1) {
+            return;
+        }
+
+        if (parseInt(hasVitals || 0, 10) === 1) {
+            $btn.text('Vitals ✓');
+            $btn.removeClass('btn-warning text-dark btn-outline-warning').addClass('btn-success').attr('title', 'Vitals Filled');
+        } else {
+            $btn.text('Vitals');
+            $btn.removeClass('btn-success').addClass('btn-warning text-dark').attr('title', 'Vitals');
+        }
+    }
+
+    function mergeLiveRowsOrReload() {
+        $.getJSON(liveRowsUrl, function(resp) {
+            if (!resp || parseInt(resp.ok || 0, 10) !== 1 || !Array.isArray(resp.rows)) {
+                reloadAppointmentList();
+                return;
+            }
+
+            var $domRows = $('#opdAllTable tbody tr[data-opd-id]');
+            if ($domRows.length !== resp.rows.length) {
+                reloadAppointmentList();
+                return;
+            }
+
+            var domMap = {};
+            $domRows.each(function() {
+                var id = parseInt($(this).attr('data-opd-id') || '0', 10);
+                if (id > 0) {
+                    domMap[id] = $(this);
+                }
+            });
+
+            var requiresFullReload = false;
+
+            for (var i = 0; i < resp.rows.length; i++) {
+                var r = resp.rows[i] || {};
+                var opdId = parseInt(r.opd_id || 0, 10);
+                if (!opdId || !domMap[opdId]) {
+                    requiresFullReload = true;
+                    break;
+                }
+
+                var $row = domMap[opdId];
+                var nextStatus = (r.status || 'booked').toString().toLowerCase();
+                var prevStatus = (($row.attr('data-opd-status') || '').toLowerCase());
+
+                // Booked transitions usually change action layout significantly, keep a safe fallback.
+                if (nextStatus === 'booked' && prevStatus !== 'booked') {
+                    requiresFullReload = true;
+                    break;
+                }
+
+                $row.attr('data-opd-status', nextStatus);
+                $row.attr('data-has-prescription', parseInt(r.has_prescription || 0, 10) === 1 ? '1' : '0');
+                $row.attr('data-has-vitals', parseInt(r.has_vitals || 0, 10) === 1 ? '1' : '0');
+
+                applyStatusVisual($row, nextStatus);
+                updateQueueCell($row, r.queue_no || 0);
+
+                if (nextStatus === 'waiting') {
+                    ensureWaitingActionButtons($row, opdId);
+                } else if (nextStatus === 'visited') {
+                    $row.find('.btn-opd-create-queue').remove();
+                    var $statusBtn = $row.find('.btn-opd-status').first();
+                    if ($statusBtn.length) {
+                        $statusBtn.removeClass('btn-outline-success').addClass('btn-success').attr('data-opd-status', '2').text('Visit Done');
+                    }
+                } else if (nextStatus === 'cancelled') {
+                    $row.find('.btn-opd-status').remove();
+                    $row.find('.btn-opd-create-queue').remove();
+                }
+
+                updateVitalsButtonState($row, r.has_prescription || 0, r.has_vitals || 0);
+            }
+
+            if (requiresFullReload) {
+                reloadAppointmentList();
+                return;
+            }
+
+            if (opdDataTable) {
+                opdDataTable.rows().invalidate().draw(false);
+            }
+
+            recalcStatusCounts();
+            applyFilters();
+            liveDigest = String(resp.digest || '');
+        }).fail(function() {
+            // Keep screen usable even if live sync fails intermittently.
+        });
+    }
+
+    function startLiveUpdates() {
+        if (window.opdLiveMonitorTimer) {
+            clearInterval(window.opdLiveMonitorTimer);
+            window.opdLiveMonitorTimer = null;
+        }
+
+        checkLiveUpdates();
+        window.opdLiveMonitorTimer = setInterval(checkLiveUpdates, livePollMs);
+    }
+
     function setVitalMessage(type, text) {
         var $msg = $('#vital_msg');
         $msg.removeClass('text-muted text-success text-danger');
@@ -274,45 +618,63 @@
         $('#vital_waist').val(vitals.waist || '');
     }
 
-    function applyMissingVitalsFilter() {
-        // Filter waiting rows to optionally show only patients whose vitals are still missing.
-        if (waitingDataTable) {
-            waitingDataTable.draw();
-            return;
+    // --- Filter button clicks ---
+    $(document).off('click.opdfilter', '.btn-opd-filter').on('click.opdfilter', '.btn-opd-filter', function() {
+        activeStatusFilter = ($(this).data('filter') || '').toLowerCase();
+        $('.btn-opd-filter').removeClass('active');
+        $(this).addClass('active');
+
+        // Clear "Only Missing Vitals" when switching away from waiting
+        if (activeStatusFilter !== 'waiting' && activeStatusFilter !== '') {
+            $('#toggle_missing_vitals_only').prop('checked', false);
         }
 
-        var onlyMissing = $('#toggle_missing_vitals_only').is(':checked');
-        var $rows = $('#tab_waiting tbody tr[data-opd-id]');
-        var visibleCount = 0;
+        applyFilters();
+    });
 
-        $rows.each(function() {
-            var hasVitals = parseInt($(this).attr('data-has-vitals') || '0', 10) === 1;
-            var show = !onlyMissing || !hasVitals;
-            $(this).toggle(show);
-            if (show) {
-                visibleCount++;
-            }
-        });
+    // Open consult page from dynamically created queue-transition buttons.
+    $(document).off('click.opdconsultopen', '.btn-opd-consult-open').on('click.opdconsultopen', '.btn-opd-consult-open', function() {
+        var opdId = parseInt($(this).data('opdid') || '0', 10);
+        if (!opdId) {
+            return;
+        }
+        load_form('/Opd_prescription/Prescription/' + opdId, 'Consult');
+    });
 
-        $('#waitingNoRowsHint').toggleClass('d-none', !(onlyMissing && $rows.length > 0 && visibleCount === 0));
-    }
+    // Missing vitals badge click: switch to Waiting + enable toggle
+    $(document).off('click.missingBadge', '#waitingMissingBadge').on('click.missingBadge', '#waitingMissingBadge', function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        if ($(this).hasClass('d-none')) {
+            return;
+        }
+        activeStatusFilter = 'waiting';
+        $('.btn-opd-filter').removeClass('active');
+        $('.btn-opd-filter[data-filter="waiting"]').addClass('active');
+        $('#toggle_missing_vitals_only').prop('checked', true);
+        applyFilters();
+    });
 
-    function updateMissingVitalsBadge() {
-        // Count waiting rows missing vitals and show badge only when count > 0.
-        syncWaitingHintAndBadge();
-    }
+    // Missing vitals toggle
+    $(document).off('change.missingVitals', '#toggle_missing_vitals_only').on('change.missingVitals', '#toggle_missing_vitals_only', function() {
+        // Auto-switch to Waiting filter when enabling this toggle
+        if ($(this).is(':checked') && activeStatusFilter !== 'waiting') {
+            activeStatusFilter = 'waiting';
+            $('.btn-opd-filter').removeClass('active');
+            $('.btn-opd-filter[data-filter="waiting"]').addClass('active');
+        }
+        applyFilters();
+    });
 
+    // --- Scan button ---
     $(document).off('click.opdscanopen', '.btn-opd-scan').on('click.opdscanopen', '.btn-opd-scan', function() {
-        // Open the scan modal and lazy-load the scan/upload panel for the selected OPD.
         var opdid = parseInt($(this).data('opdid') || '0', 10);
         if (!opdid || !modalObj) {
             return;
         }
-
         $('#testentryLabel').text('OPD Scan');
         $('#testentry-bodyc').html('<div class="text-muted">Loading...</div>');
         modalObj.show();
-
         $.post('/Opd/opd_load_doc/' + opdid, {}, function(html) {
             $('#testentry-bodyc').html(html || '<div class="text-danger">Unable to load scan panel.</div>');
         }).fail(function() {
@@ -320,17 +682,15 @@
         });
     });
 
+    // --- Scan Doc List button ---
     $(document).off('click.opdscanlistopen', '.btn-opd-scan-list').on('click.opdscanlistopen', '.btn-opd-scan-list', function() {
-        // Open modal with slide-by-slide scan document list for this OPD.
         var opdid = parseInt($(this).data('opdid') || '0', 10);
         if (!opdid || !modalObj) {
             return;
         }
-
         $('#testentryLabel').text('Scan Document List');
         $('#testentry-bodyc').html('<div class="text-muted">Loading...</div>');
         modalObj.show();
-
         $.post('/Opd/opd_file_list/' + opdid, {}, function(html) {
             $('#testentry-bodyc').html(html || '<div class="text-danger">No scan documents found.</div>');
         }).fail(function() {
@@ -339,29 +699,24 @@
     });
 
     window.deleteOpdScanFromList = function(fileId, opdid) {
-        // Delete only allowed for current-date uploads; server enforces this rule.
         if (!fileId || !opdid) {
             return;
         }
         if (!window.confirm('Delete this scan document?')) {
             return;
         }
-
         var csrf = getCsrfPair();
         var payload = {};
         payload[csrf.name] = csrf.value;
-
         $.post('/Opd/opd_file_delete/' + fileId, payload, function(resp) {
             if (resp && resp.csrfName && resp.csrfHash) {
                 updateCsrf(resp);
             }
-
             if (!resp || parseInt(resp.update || 0, 10) !== 1) {
                 var msg = (resp && resp.error_text) ? resp.error_text : 'Unable to delete document.';
                 $('#testentry-bodyc').prepend('<div class="alert alert-danger py-1 mb-2">' + $('<div>').text(msg).html() + '</div>');
                 return;
             }
-
             $.post('/Opd/opd_file_list/' + opdid, {}, function(html) {
                 $('#testentry-bodyc').html(html || '<div class="text-muted">No scan documents found.</div>');
             }).fail(function() {
@@ -372,68 +727,129 @@
         });
     };
 
+    // --- Visit Done / Status buttons ---
     $(document).off('click.opdstatus', '.btn-opd-status').on('click.opdstatus', '.btn-opd-status', function() {
-        var opdId = $(this).data('opd-id');
-        var opdStatus = $(this).data('opd-status');
+        var $btn = $(this);
+        var opdId = parseInt($btn.data('opd-id') || '0', 10);
+        var opdStatus = parseInt($btn.data('opd-status') || '0', 10);
         if (!opdId || !opdStatus) {
             return;
         }
 
-        $.post('/Opd/opd_status/' + opdId + '/' + opdStatus, {}, function() {
-            reloadAppointmentList();
+        var $row = $('#opdAllTable tbody tr[data-opd-id="' + opdId + '"]');
+        if (!$row.length) {
+            return;
+        }
+
+        var previousLabel = ($btn.text() || '').trim() || 'Visit Done';
+        isUserUpdateInProgress = true;
+        $btn.prop('disabled', true).text('Updating...');
+
+        $.post('/Opd/opd_status/' + opdId + '/' + opdStatus, {}, function(resp) {
+            if (!resp || parseInt(resp.update || 0, 10) !== 1) {
+                window.alert((resp && resp.message) ? resp.message : 'Unable to update status');
+                $btn.prop('disabled', false).text(previousLabel);
+                isUserUpdateInProgress = false;
+                return;
+            }
+
+            var nextStatus = 'booked';
+            if (parseInt(resp.opd_status || 0, 10) === 2) {
+                nextStatus = 'visited';
+            } else if (parseInt(resp.opd_status || 0, 10) === 3) {
+                nextStatus = 'cancelled';
+            }
+
+            $row.attr('data-opd-status', nextStatus);
+            applyStatusVisual($row, nextStatus);
+
+            // Keep row action state consistent after transition to visited.
+            if (nextStatus === 'visited') {
+                $btn.removeClass('btn-outline-success').addClass('btn-success').text('Visit Done');
+                $btn.prop('disabled', false);
+            } else {
+                $btn.prop('disabled', false).text(previousLabel);
+            }
+
+            if (opdDataTable) {
+                opdDataTable.row($row).invalidate();
+            }
+
+            recalcStatusCounts();
+            applyFilters();
+            isUserUpdateInProgress = false;
+        }, 'json').fail(function() {
+            window.alert('Unable to update status');
+            $btn.prop('disabled', false).text(previousLabel);
+            isUserUpdateInProgress = false;
         });
     });
 
+    // --- Create Queue button ---
     $(document).off('click.opdcreatequeue', '.btn-opd-create-queue').on('click.opdcreatequeue', '.btn-opd-create-queue', function() {
         var opdId = parseInt($(this).data('opdid') || '0', 10);
         if (!opdId) {
             return;
         }
 
+        var $row = $('#opdAllTable tbody tr[data-opd-id="' + opdId + '"]');
+        if (!$row.length) {
+            return;
+        }
+
         var $btn = $(this);
+        var previousText = ($btn.text() || '').trim() || 'Queue';
+        isUserUpdateInProgress = true;
         $btn.prop('disabled', true).text('Queueing...');
 
         $.post('/Opd_prescription/create_opd_queue/' + opdId, {}, function(resp) {
             var message = (resp || '').toString().trim();
             if (message !== 'Queue Created') {
                 window.alert(message || 'Unable to create queue');
-                $btn.prop('disabled', false).text('Queue');
+                $btn.prop('disabled', false).text(previousText);
+                isUserUpdateInProgress = false;
                 return;
             }
 
-            reloadAppointmentList();
-        }).fail(function(xhr) {
-            var message = 'Unable to create queue';
-            if (xhr && xhr.responseText) {
-                message = xhr.responseText;
+            // Queue creation moves booked/confirmed patient to waiting workflow without reloading page.
+            $row.attr('data-opd-status', 'waiting');
+            $row.attr('data-has-prescription', '1');
+            applyStatusVisual($row, 'waiting');
+            ensureWaitingActionButtons($row, opdId);
+
+            if (opdDataTable) {
+                opdDataTable.row($row).invalidate();
             }
-            window.alert(message);
-            $btn.prop('disabled', false).text('Queue');
+
+            recalcStatusCounts();
+            applyFilters();
+            isUserUpdateInProgress = false;
+        }).fail(function(xhr) {
+            window.alert((xhr && xhr.responseText) ? xhr.responseText : 'Unable to create queue');
+            $btn.prop('disabled', false).text(previousText);
+            isUserUpdateInProgress = false;
         });
     });
 
+    // --- Vitals modal open ---
     $(document).off('click.opdvitalsopen', '.btn-opd-vitals').on('click.opdvitalsopen', '.btn-opd-vitals', function() {
-        // Open vitals modal and prefill with any existing values from prescription session.
         var opdid = parseInt($(this).data('opdid') || '0', 10);
         var patient = ($(this).data('patient') || '').toString();
         if (!opdid || !vitalsModalObj) {
             return;
         }
-
         $('#vital_opd_id').val(opdid);
         $('#vital_opd_session_id').val('0');
         $('#vital_patient_label').text('Patient: ' + (patient || '-'));
         fillVitals({});
         setVitalMessage('normal', 'Loading previous vitals...');
         vitalsModalObj.show();
-
         $.getJSON('/Opd_prescription/vitals_get/' + opdid, function(data) {
             updateCsrf(data);
             if (parseInt(data.update || 0, 10) !== 1) {
                 setVitalMessage('err', data.error_text || 'Unable to load vitals');
                 return;
             }
-
             $('#vital_opd_session_id').val(parseInt(data.opd_session_id || '0', 10));
             fillVitals(data.vitals || {});
             setVitalMessage('normal', 'Vitals loaded.');
@@ -442,89 +858,74 @@
         });
     });
 
+    // --- Vitals save ---
     $('#btn_save_vitals').on('click', function() {
-        // Persist vitals, then update the waiting list row state without full-page refresh.
         var opdId = parseInt($('#vital_opd_id').val() || '0', 10);
         if (opdId <= 0) {
             setVitalMessage('err', 'Invalid OPD selected');
             return;
         }
-
         var csrf = getCsrfPair();
         var payload = {
             opd_id: opdId,
             opd_session_id: parseInt($('#vital_opd_session_id').val() || '0', 10),
-            pulse: ($('#vital_pulse').val() || '').trim(),
-            spo2: ($('#vital_spo2').val() || '').trim(),
-            bp: ($('#vital_bp').val() || '').trim(),
+            pulse:     ($('#vital_pulse').val()     || '').trim(),
+            spo2:      ($('#vital_spo2').val()      || '').trim(),
+            bp:        ($('#vital_bp').val()        || '').trim(),
             diastolic: ($('#vital_diastolic').val() || '').trim(),
-            temp: ($('#vital_temp').val() || '').trim(),
-            rr_min: ($('#vital_rr_min').val() || '').trim(),
-            height: ($('#vital_height').val() || '').trim(),
-            weight: ($('#vital_weight').val() || '').trim(),
-            waist: ($('#vital_waist').val() || '').trim()
+            temp:      ($('#vital_temp').val()      || '').trim(),
+            rr_min:    ($('#vital_rr_min').val()    || '').trim(),
+            height:    ($('#vital_height').val()    || '').trim(),
+            weight:    ($('#vital_weight').val()    || '').trim(),
+            waist:     ($('#vital_waist').val()     || '').trim()
         };
         payload[csrf.name] = csrf.value;
 
         var $btn = $(this);
+        isUserUpdateInProgress = true;
         $btn.prop('disabled', true).text('Saving...');
         $.post('/Opd_prescription/vitals_save', payload, function(data) {
             updateCsrf(data);
             $btn.prop('disabled', false).text('Save Vitals');
             if (parseInt(data.update || 0, 10) !== 1) {
                 setVitalMessage('err', data.error_text || 'Unable to save vitals');
+                isUserUpdateInProgress = false;
                 return;
             }
-
             $('#vital_opd_session_id').val(parseInt(data.opd_session_id || '0', 10));
             setVitalMessage('ok', data.error_text || 'Vitals saved successfully');
 
-            var $row = $('#tab_waiting tbody tr[data-opd-id="' + opdId + '"]');
+            // Update row in unified table (not tab-specific)
+            var $row = $('#opdAllTable tbody tr[data-opd-id="' + opdId + '"]');
             if ($row.length) {
                 $row.attr('data-has-vitals', '1');
-                var $vitalBtn = $row.find('td:last').find('.btn-opd-vitals').first();
+                var $vitalBtn = $row.find('.btn-opd-vitals').first();
                 if ($vitalBtn.length) {
-                    var btnText = ($vitalBtn.text() || '').trim();
-                    if (btnText.indexOf('✓') === -1) {
+                    if (($vitalBtn.text() || '').trim().indexOf('✓') === -1) {
                         $vitalBtn.text('Vitals ✓');
                     }
                     $vitalBtn.removeClass('btn-warning text-dark btn-outline-warning').addClass('btn-success');
                     $vitalBtn.attr('title', 'Vitals Filled');
                 }
-                if (waitingDataTable) {
-                    waitingDataTable.rows().invalidate().draw(false);
+                if (opdDataTable) {
+                    opdDataTable.rows().invalidate().draw(false);
                 }
-                updateMissingVitalsBadge();
-                applyMissingVitalsFilter();
+                syncWaitingHintAndBadge();
             }
+            isUserUpdateInProgress = false;
         }, 'json').fail(function() {
             $btn.prop('disabled', false).text('Save Vitals');
             setVitalMessage('err', 'Unable to save vitals');
+            isUserUpdateInProgress = false;
         });
     });
 
-    $(document).off('change.missingVitals', '#toggle_missing_vitals_only').on('change.missingVitals', '#toggle_missing_vitals_only', function() {
-        applyMissingVitalsFilter();
-    });
-
-    $(document).off('click.missingBadge', '#waitingMissingBadge').on('click.missingBadge', '#waitingMissingBadge', function(e) {
-        e.preventDefault();
-        e.stopPropagation();
-        if ($(this).hasClass('d-none')) {
-            return;
-        }
-        var $toggle = $('#toggle_missing_vitals_only');
-        $toggle.prop('checked', true);
-        applyMissingVitalsFilter();
-
-        var waitingTabTrigger = document.querySelector('button[data-bs-target="#tab_waiting"]');
-        if (waitingTabTrigger) {
-            bootstrap.Tab.getOrCreateInstance(waitingTabTrigger).show();
-        }
-    });
-
-    initializeOpdTables();
-    updateMissingVitalsBadge();
-    applyMissingVitalsFilter();
+    // Initialize
+    registerOpdTableFilter();
+    opdDataTable = initializeOpdTable();
+    recalcStatusCounts();
+    syncWaitingHintAndBadge();
+    startLiveUpdates();
 })();
 </script>
+
diff --git a/app/Views/billing/opd_invoice_V.php b/app/Views/billing/opd_invoice_V.php
index da32477..1b5b39e 100644
--- a/app/Views/billing/opd_invoice_V.php
+++ b/app/Views/billing/opd_invoice_V.php
@@ -13,10 +13,14 @@ if ($user) {
 $paymentHistoryRows = $payment_history_rows ?? [];
 ?>
 <section class="content-header">
-    <h1>OPD Invoice</h1>
-    <ol class="breadcrumb">
-        <li><a href="javascript:load_form('<?= base_url('billing/patient/person_record') ?>/<?= esc($opd_master[0]->p_id ?? 0) ?>/0');">Person Home</a></li>
-    </ol>
+    <div class="d-flex justify-content-between align-items-center flex-wrap gap-2">
+        <h1 class="mb-0">OPD Invoice</h1>
+        <button type="button"
+                class="btn btn-outline-primary"
+                onclick="load_form('<?= base_url('billing/patient/person_record') ?>/<?= esc($opd_master[0]->p_id ?? 0) ?>/0','Patient Record');">
+            Person Home
+        </button>
+    </div>
 </section>
 
 <section class="invoice">
diff --git a/app/Views/billing/search_adv_data.php b/app/Views/billing/search_adv_data.php
index 0cf03d2..0ed7d72 100644
--- a/app/Views/billing/search_adv_data.php
+++ b/app/Views/billing/search_adv_data.php
@@ -1,11 +1,193 @@
-<?php if (!empty($search_result)) : ?>
-    <ul class="list-group">
+<?php
+$formatDate = static function ($value): string {
+    $value = trim((string) $value);
+    if ($value === '' || $value === '0000-00-00') {
+        return '';
+    }
+
+    $dt = \DateTime::createFromFormat('Y-m-d', $value);
+    if (! $dt) {
+        return '';
+    }
+
+    return $dt->format('d-m-Y');
+};
+
+$getAgeDisplay = static function ($row): string {
+    $dob = trim((string) ($row->dob ?? ''));
+    if ($dob !== '' && $dob !== '0000-00-00') {
+        $dobDate = date_create($dob);
+        if ($dobDate !== false) {
+            $ageYears = date_diff($dobDate, new \DateTime('today'))->y;
+            return (string) $ageYears;
+        }
+    }
+
+    $years = trim((string) ($row->age ?? ''));
+    $months = trim((string) ($row->age_in_month ?? ''));
+    if ($years !== '') {
+        return $months !== '' ? ($years . 'y ' . $months . 'm') : $years;
+    }
+
+    return '';
+};
+
+$genderLabel = static function ($gender): string {
+    $gender = trim((string) $gender);
+    if ($gender === '1') {
+        return 'Male';
+    }
+    if ($gender === '2') {
+        return 'Female';
+    }
+
+    return $gender !== '' ? $gender : 'NA';
+};
+
+$normalize = static function ($value): string {
+    return strtoupper(trim((string) $value));
+};
+
+$filters = $filters ?? [];
+$filterPhone = trim((string) ($filters['input_mphone1'] ?? ''));
+$filterAadhaar = $normalize($filters['input_udai'] ?? '');
+$filterAbha = trim((string) ($filters['input_abha_id'] ?? ''));
+$filterName = $normalize($filters['input_name'] ?? '');
+$filterRelativeName = $normalize($filters['input_relative_name'] ?? '');
+
+$getMatchScore = static function ($row) use ($normalize, $filterPhone, $filterAadhaar, $filterAbha, $filterName, $filterRelativeName): int {
+    $score = 0;
+
+    if ($filterPhone !== '' && trim((string) ($row->mphone1 ?? '')) === $filterPhone) {
+        $score++;
+    }
+
+    if ($filterAadhaar !== '' && $normalize($row->udai ?? '') === $filterAadhaar) {
+        $score++;
+    }
+
+    if ($filterAbha !== '' && trim((string) ($row->abha_id ?? '')) === $filterAbha) {
+        $score++;
+    }
+
+    if (
+        $filterName !== ''
+        && $filterRelativeName !== ''
+        && $normalize($row->p_fname ?? '') === $filterName
+        && $normalize($row->p_rname ?? '') === $filterRelativeName
+    ) {
+        $score++;
+    }
+
+    return $score;
+};
+
+$getConfidence = static function (int $score): array {
+    if ($score >= 3) {
+        return ['High', 'bg-danger'];
+    }
+
+    if ($score === 2) {
+        return ['Medium', 'bg-warning text-dark'];
+    }
+
+    return ['Low', 'bg-secondary'];
+};
+
+if (! empty($search_result) && is_array($search_result)) {
+    usort($search_result, static function ($a, $b) use ($getMatchScore) {
+        $scoreA = $getMatchScore($a);
+        $scoreB = $getMatchScore($b);
+
+        if ($scoreA !== $scoreB) {
+            return $scoreB <=> $scoreA;
+        }
+
+        return ((int) ($b->id ?? 0)) <=> ((int) ($a->id ?? 0));
+    });
+}
+?>
+
+<?php if (! empty($search_result)) : ?>
+    <div class="list-group">
         <?php foreach ($search_result as $row) : ?>
-            <li class="list-group-item">
-                <?= esc($row->Sresult ?? '') ?>
-            </li>
-        <?php endforeach ?>
-    </ul>
+            <?php
+            $profileUrl = base_url('billing/patient/person_record') . '/' . (int) ($row->id ?? 0);
+            $fullName = trim((string) ($row->p_fname ?? ''));
+            $relative = trim((string) ($row->p_relative ?? '')) . ' ' . trim((string) ($row->p_rname ?? ''));
+            $relative = trim($relative);
+            $addressParts = array_filter([
+                trim((string) ($row->add1 ?? '')),
+                trim((string) ($row->city ?? '')),
+                trim((string) ($row->district ?? '')),
+                trim((string) ($row->state ?? '')),
+                trim((string) ($row->zip ?? '')),
+            ], static fn($v) => $v !== '');
+            $addressText = implode(', ', $addressParts);
+            $lastVisit = $formatDate($row->last_visit ?? '');
+            $ageDisplay = $getAgeDisplay($row);
+            $gender = $genderLabel($row->gender ?? '');
+
+            $matchReasons = [];
+            if ($filterPhone !== '' && trim((string) ($row->mphone1 ?? '')) === $filterPhone) {
+                $matchReasons[] = 'Phone';
+            }
+            if ($filterAadhaar !== '' && $normalize($row->udai ?? '') === $filterAadhaar) {
+                $matchReasons[] = 'Aadhaar';
+            }
+            if ($filterAbha !== '' && trim((string) ($row->abha_id ?? '')) === $filterAbha) {
+                $matchReasons[] = 'ABHA';
+            }
+            if (
+                $filterName !== ''
+                && $filterRelativeName !== ''
+                && $normalize($row->p_fname ?? '') === $filterName
+                && $normalize($row->p_rname ?? '') === $filterRelativeName
+            ) {
+                $matchReasons[] = 'Name + Relative';
+            }
+
+            $isStrongDuplicate = count($matchReasons) > 1;
+              $matchScore = $getMatchScore($row);
+              [$confidenceText, $confidenceClass] = $getConfidence($matchScore);
+            ?>
+            <div class="list-group-item list-group-item-action <?= $isStrongDuplicate ? 'border border-warning' : '' ?>"
+                 role="button"
+                 tabindex="0"
+                 onclick="load_form('<?= esc($profileUrl) ?>', 'Patient Record');"
+                 onkeydown="if(event.key==='Enter' || event.key===' '){event.preventDefault();load_form('<?= esc($profileUrl) ?>', 'Patient Record');}">
+                <div class="d-flex justify-content-between align-items-start gap-2">
+                    <div class="fw-semibold"><?= esc($fullName !== '' ? $fullName : 'Unknown') ?></div>
+                    <button type="button"
+                            class="btn btn-sm btn-outline-primary"
+                            onclick="event.stopPropagation(); load_form('<?= esc($profileUrl) ?>', 'Patient Record');">
+                        View Profile
+                    </button>
+                </div>
+                <div class="small text-muted"><?= esc($relative !== '' ? $relative : 'Relative: NA') ?></div>
+                <?php if (! empty($matchReasons)) : ?>
+                    <div class="mt-1">
+                        <span class="badge <?= esc($confidenceClass) ?> me-1">Confidence: <?= esc($confidenceText) ?></span>
+                        <?php foreach ($matchReasons as $reason) : ?>
+                            <span class="badge <?= $isStrongDuplicate ? 'bg-warning text-dark' : 'bg-info text-dark' ?> me-1">Match: <?= esc($reason) ?></span>
+                        <?php endforeach; ?>
+                    </div>
+                <?php endif; ?>
+                <div class="mt-1 small">
+                    <span class="me-2"><strong>Gender:</strong> <?= esc($gender) ?></span>
+                    <?php if ($ageDisplay !== '') : ?>
+                        <span class="me-2"><strong>Age:</strong> <?= esc($ageDisplay) ?></span>
+                    <?php endif; ?>
+                    <?php if ($lastVisit !== '') : ?>
+                        <span><strong>Last Visit:</strong> <?= esc($lastVisit) ?></span>
+                    <?php endif; ?>
+                </div>
+                <?php if ($addressText !== '') : ?>
+                    <div class="small mt-1"><strong>Address:</strong> <?= esc($addressText) ?></div>
+                <?php endif; ?>
+            </div>
+        <?php endforeach; ?>
+    </div>
 <?php else : ?>
     <div class="text-muted">No matching records.</div>
-<?php endif ?>
+<?php endif; ?>