diff --git a/app/Controllers/PrintLabelSby.php b/app/Controllers/PrintLabelSby.php
index 2353a36..c812e2c 100644
--- a/app/Controllers/PrintLabelSby.php
+++ b/app/Controllers/PrintLabelSby.php
@@ -41,10 +41,10 @@ class PrintLabelSby extends BaseController {
 		$networkPath = "";
 
 		$db = \Config\Database::connect();
-		$sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, p.NAME, p.SEX,
+		$sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, concat (p.NAME, ' ',p.FIRSTNAME) as NAME, p.SEX,
 				DATEDIFF(YEAR, BirthDate, GETDATE()) - 
 					CASE WHEN MONTH(BirthDate) > MONTH(GETDATE()) OR (MONTH(BirthDate) = MONTH(GETDATE()) AND DAY(BirthDate) > DAY(GETDATE())) THEN 1 
-					ELSE 0 END AS AGE, sr.COLLECTIONDATE
+					ELSE 0 END AS AGE, sr.COLLECTIONDATE, p.BIRTHDATE
 				from SP_REQUESTS sr
 				left join SP_REQUESTS st on sr.SP_ACCESSNUMBER=st.SP_ACCESSNUMBER
 				left join PATIENTS p on p.PATID=sr.PATID
@@ -59,6 +59,14 @@ class PrintLabelSby extends BaseController {
 		$title = $item['SEX'] == 1 ? "Mr" : "Mrs";
 		$name = $item['NAME'];
 		$age = $item['AGE'];
+		$birthdate = $item['BIRTHDATE'];
+		$date = \DateTime::createFromFormat('Y-m-d H:i:s.v', $birthdate);
+		if ($date) {
+			$birthdate = $date->format('d/m/Y');
+		} else {
+			$birthdate = "";
+		}
+
 		$collectiondate = $item['COLLECTIONDATE'];
 		$date = \DateTime::createFromFormat('Y-m-d H:i:s.v', $collectiondate);
 		if ($date) {
@@ -140,7 +148,7 @@ class PrintLabelSby extends BaseController {
 ^FO$jarak,37^ADN,18,10^FD$name2^FS
 ^FO325,42^ADN,18,10^FD$sex {$age}Y^FS
 ^FO4,54^ADN,18,10^FD$sample^FS
-^FO265,64^ADN,18,10^FDChapter^FS
+^FO265,64^ADN,18,10^FD$birthdate^FS
 ^FO65,85^BY2,3,70^BCN,70,N,N^FD$barcode^FS
 ^FO115,160^ADN,18,10^FDSAM# $barcode^FS
 ^FO4,182^ADN,18,10^FDRM:$uhid^FS
@@ -168,11 +176,11 @@ class PrintLabelSby extends BaseController {
 		$networkPath = "";
 
 		$db = \Config\Database::connect();
-		$sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, p.NAME, p.SEX,
+		$sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, concat (p.NAME, ' ',p.FIRSTNAME) as NAME, p.SEX,
 				DATEDIFF(YEAR, BirthDate, GETDATE()) - 
 					CASE WHEN MONTH(BirthDate) > MONTH(GETDATE()) OR (MONTH(BirthDate) = MONTH(GETDATE()) AND DAY(BirthDate) > DAY(GETDATE())) THEN 1 
 					ELSE 0 END AS AGE, 
-				ds.FULLTEXT, st.SAMPLETYPE+right(sr.SP_ACCESSNUMBER,5) as BARCODE, sr.COLLECTIONDATE
+				ds.FULLTEXT, st.SAMPLETYPE+right(sr.SP_ACCESSNUMBER,5) as BARCODE, sr.COLLECTIONDATE, p.BIRTHDATE
 				from SP_TUBES st
 				left join SP_REQUESTS sr on st.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
 				left join PATIENTS p on p.PATID=sr.PATID