diff --git a/app/Commands/TestPatientSearch.php b/app/Commands/TestPatientSearch.php
new file mode 100644
index 0000000..5c2a99b
--- /dev/null
+++ b/app/Commands/TestPatientSearch.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+class TestPatientSearch extends BaseCommand
+{
+    protected $group = 'Test';
+    protected $name = 'patient:test-search';
+    protected $description = 'Test patient search by ABHA ID or Address in search_ajax';
+
+    public function run(array $params)
+    {
+        $testCases = [
+            ['label' => 'Direct ABHA Address', 'get' => ['search_query' => 'kajolallu2001@sbx']],
+            ['label' => 'Direct 14-digit ABHA Number', 'get' => ['search_query' => '91408143313273']],
+            ['label' => 'Direct Hyphenated ABHA Number', 'get' => ['search_query' => '91-4081-4331-3273']],
+            ['label' => 'Partial ABHA Address (kajol)', 'get' => ['search_query' => 'kajol']],
+            ['label' => 'DataTables Search Box with ABHA Address', 'get' => ['dt_search' => 'kajolallu2001@sbx']],
+            ['label' => 'DataTables Search Box with 14-digit ABHA Number', 'get' => ['dt_search' => '91408143313273']],
+            ['label' => 'Advanced Search by ABHA Address', 'get' => ['adv_search_by' => 'abha', 'adv_search_value' => 'kajolallu2001@sbx']],
+            ['label' => 'Advanced Search by 14-digit ABHA Number', 'get' => ['adv_search_by' => 'abha', 'adv_search_value' => '91408143313273']],
+            ['label' => 'Advanced Search by Hyphenated ABHA Number', 'get' => ['adv_search_by' => 'abha', 'adv_search_value' => '91-4081-4331-3273']],
+        ];
+
+        foreach ($testCases as $tc) {
+            CLI::write("Testing: " . $tc['label'], 'yellow');
+            $_SERVER['REQUEST_METHOD'] = 'GET';
+            $_GET = array_merge([
+                'start' => 0,
+                'length' => 10,
+            ], $tc['get']);
+
+            $controller = new \App\Controllers\Patient();
+            $request = \Config\Services::request();
+            $response = \Config\Services::response();
+            $logger = service('logger');
+            $controller->initController($request, $response, $logger);
+
+            $res = $controller->search_ajax();
+            $body = $res->getBody();
+            $json = json_decode($body, true);
+
+            $total = $json['recordsFiltered'] ?? 0;
+            $data = $json['data'] ?? [];
+
+            CLI::write("  Records found: " . $total, $total > 0 ? 'green' : 'red');
+            foreach ($data as $idx => $row) {
+                // $row is [sr_no, p_code_cell, name_cell, age, last_visit, insurance, history]
+                $pCode = strip_tags($row[1] ?? '');
+                $pName = strip_tags($row[2] ?? '');
+                CLI::write("    [#{$idx}] Code/ABHA: {$pCode} | Name: {$pName}");
+            }
+            CLI::newLine();
+        }
+    }
+}
diff --git a/app/Controllers/Patient.php b/app/Controllers/Patient.php
index 39d121a..f4eaf3c 100644
--- a/app/Controllers/Patient.php
+++ b/app/Controllers/Patient.php
@@ -1074,10 +1074,18 @@ class Patient extends BaseController
 			}
 
 			$abhaDisplay = '';
-			if (!empty($row->abha_address)) {
-				$abhaDisplay = (string) $row->abha_address;
-			} elseif (!empty($row->abha_id)) {
-				$abhaDisplay = (string) $row->abha_id;
+			$abhaAddr = trim((string) ($row->abha_address ?? ''));
+			$abhaNum = trim((string) ($row->abha_id ?? ($row->abha_no ?? ($row->abha ?? ''))));
+			$cleanNum = preg_replace('/\D/', '', $abhaNum) ?? '';
+			if (strlen($cleanNum) === 14) {
+				$abhaNum = substr($cleanNum, 0, 2) . '-' . substr($cleanNum, 2, 4) . '-' . substr($cleanNum, 6, 4) . '-' . substr($cleanNum, 10, 4);
+			}
+			if ($abhaAddr !== '' && $abhaNum !== '') {
+				$abhaDisplay = $abhaAddr . ' (' . $abhaNum . ')';
+			} elseif ($abhaAddr !== '') {
+				$abhaDisplay = $abhaAddr;
+			} elseif ($abhaNum !== '') {
+				$abhaDisplay = $abhaNum;
 			}
 			
 			$data[] = [