diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php
index 08ee331..4299c1f 100644
--- a/app/Views/admin/dashboard.php
+++ b/app/Views/admin/dashboard.php
@@ -111,8 +111,10 @@ function index() {
 				colltime = data[i].COLLECTIONDATE.slice(10,16);
 
 				if (data[i].PATNUMBER != null) {
-					patnumber = data[i].PATNUMBER.substr(-16,16);
-					patnumber = patnumber.substring(patnumber.length - 10);
+					// patnumber = data[i].PATNUMBER;
+					patnumber = data[i].PATNUMBER.replace(/^0+/, '');
+					// patnumber = data[i].PATNUMBER.substr(-16,16);
+					// patnumber = patnumber.substring(patnumber.length - 10);
 				} else {
 					patnumber = ' NULL ';
 				}
diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php
index 92d8366..1382d86 100644
--- a/app/Views/fo/dashboard.php
+++ b/app/Views/fo/dashboard.php
@@ -33,7 +33,7 @@
 					<th width="12%">Patient#</th>
 					<th width="17%">Patient Name</th>
 					<th class='text-start' width="10%">Access#</th>
-					<th width="9%">Reff#</th>
+					<th width="9%">Visit#</th>
 					<th>Test</th>
 					<th>Status</th>
 					<th></th>
@@ -111,8 +111,9 @@ function index() {
 				colltime = data[i].COLLECTIONDATE.slice(10,16);
 
 				if (data[i].PATNUMBER != null) {
-					patnumber = data[i].PATNUMBER.substr(-16,16);
-					patnumber = patnumber.substring(patnumber.length - 10);
+					patnumber = data[i].PATNUMBER.replace(/^0+/, '');
+					// patnumber = data[i].PATNUMBER.substr(-16,16);
+					// patnumber = patnumber.substring(patnumber.length - 10);
 				} else {
 					patnumber = ' NULL ';
 				}
diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php
index a37b8f0..151ca5f 100644
--- a/app/Views/sampling/dashboard.php
+++ b/app/Views/sampling/dashboard.php
@@ -111,8 +111,9 @@ function index() {
 				colltime = data[i].COLLECTIONDATE.slice(10,16);
 
 				if (data[i].PATNUMBER != null) {
-					patnumber = data[i].PATNUMBER.substr(-16,16);
-					patnumber = patnumber.substring(patnumber.length - 10);
+					patnumber = data[i].PATNUMBER.replace(/^0+/, '');
+					// patnumber = data[i].PATNUMBER.substr(-16,16);
+					// patnumber = patnumber.substring(patnumber.length - 10);
 				} else {
 					patnumber = ' NULL ';
 				}
diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php
index 4345edc..381fb27 100644
--- a/app/Views/user/dashboard.php
+++ b/app/Views/user/dashboard.php
@@ -111,8 +111,9 @@ function index() {
 				colltime = data[i].COLLECTIONDATE.slice(10,16);
 
 				if (data[i].PATNUMBER != null) {
-					patnumber = data[i].PATNUMBER.substr(-16,16);
-					patnumber = patnumber.substring(patnumber.length - 10);
+					patnumber = data[i].PATNUMBER.replace(/^0+/, '');
+					// patnumber = data[i].PATNUMBER.substr(-16,16);
+					// patnumber = patnumber.substring(patnumber.length - 10);
 				} else {
 					patnumber = ' NULL ';
 				}