diff --git a/app/Controllers/API_Tubes.php b/app/Controllers/API_Tubes.php
index af140b1..e2b057d 100644
--- a/app/Controllers/API_Tubes.php
+++ b/app/Controllers/API_Tubes.php
@@ -21,7 +21,7 @@ class API_Tubes extends BaseController {
 	
 	public function uncollect($access, $sample) {
 		$db = \Config\Database::connect();
-		$sql = "UPDATE cmod.dbo.CM_TUBES set COLLSTATUS=0 where ACCESSNUMBER='$access' and SAMPLETYPE='$sample'";
+		$sql = "UPDATE cmod.dbo.CM_TUBES set COLLSTATUS=0, COLLECTIONDATE=null where ACCESSNUMBER='$access' and SAMPLETYPE='$sample'";
 		$query = $db->query($sql);
     }
 	
diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index ac31e58..f0f189e 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -841,7 +841,7 @@ class PrintResult extends BaseController {
 			// Untuk mewarnai value yang tidak beda dengan nilai normal
 			$color = "";
 			if ($resflag == 'L' || $resflag == 'H') {
-				$resflag .= "  ";
+				// $resflag .= "  ";
 				$color = "red_font";
 			}
 
@@ -897,7 +897,7 @@ class PrintResult extends BaseController {
 						<td colspan='1' class=''>
 							".$test."
 						</td>
-						<td colspan='3' class='left-pad ".$color."'>" . $resflag ." ". $resvalue . $rescomment ."</td>
+						<td colspan='3' class='left-pad ".$color."'>$resflag " . $resvalue . $rescomment ."</td>
 						<td class='left-pad'>" . $serum_type . "</td>
 					</tr>
 				";
@@ -915,7 +915,7 @@ class PrintResult extends BaseController {
 						<td style='width: 35%;' colspan='1' class=''>
 							".$test."
 						</td>
-						<td style='width: 20%;' class='left-pad ".$color."'>" . $resflag ." ". $resvalue .  $rescomment ."</td>
+						<td style='width: 20%;' class='right-pad ".$color."'>" . $resvalue . " $resflag " .  $rescomment ."</td>
 						<td style='width: 13%;' class='left-pad'>" . "<pre>" .$unit. "<pre>" . "</td>
 						<td style='width: 20%;' class='left-pad'>" . "<pre>" .$reff. "<pre>" . "</td>
 						<td style='width: 12%;' class='left-pad'>" . $serum_type . "</td>
@@ -996,18 +996,18 @@ class PrintResult extends BaseController {
 		// Memisahkan Waktu yang ditampilkan pada laporan hasil
 		$filter_query_collection="";
 		if ($cityid == 1) {
-			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS recvtime ";
+			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS colltime ";
 		} elseif ($cityid == 2) {
-			$filter_query_collection = " FORMAT(DATEADD(HOUR, -1, ct.COLLECTIONDATE), 'HH:mm') AS recvtime ";
+			$filter_query_collection = " FORMAT(DATEADD(HOUR, -1, ct.COLLECTIONDATE), 'HH:mm') AS colltime ";
 		} else {
-			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS recvtime ";
+			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS colltime ";
 		}
 		// Untuk Collection
 		$sql = "SELECT 
-					ds.SHORTTEXT, 
-					FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS colldate, 
-					FORMAT(tu.COLLECTIONDATE, 'HH:mm') AS colltime, 
-					FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS recvdate, 
+					ds.SHORTTEXT,
+					FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS colldate, 
+					FORMAT(tu.LABRECEPTIONDATE, 'dd-MM-yyyy') AS recvdate,
+					FORMAT(tu.LABRECEPTIONDATE, 'HH:mm') AS recvtime,					
 					".$filter_query_collection."
 				FROM 
 					SP_TUBES tu
@@ -1016,7 +1016,7 @@ class PrintResult extends BaseController {
 				LEFT JOIN 
 					cmod.dbo.CM_TUBES ct ON ct.SAMPLETYPE = tu.SAMPLETYPE AND ct.ACCESSNUMBER = tu.SP_ACCESSNUMBER
 				WHERE 
-					tu.SP_ACCESSNUMBER = '$access';";
+					tu.SP_ACCESSNUMBER = '$access'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$collection = $results;
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index cb0a9c4..3322859 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -63,7 +63,7 @@ if(isset($data[0])) {
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printAllLabel(<?=$accessnumber;?>, <?=$usercityid;?>)"> <h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6> </button> 
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collectAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Coll.</h6></button> 
 								<!-- <button class='badge bg-black text-white m-0 px-2 py-1' onclick='uncollectAll(<?=$accessnumber;?>)'>un-collect</button> -->
-								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
+								<!-- <button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>  -->
 							</td>
 						</tr>
 						<tr> 
@@ -99,7 +99,7 @@ if(isset($data[0])) {
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype, $usercityid)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
 								<button type='button' class='btn btn-warning m-0 px-2 py-1' onclick='uncollect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Coll.</h6></button> 
-								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
+								<!-- <button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> -->
 							</td> ";
 						echo "<td id='comment$sampletype'>$comment <h6 class='p-0 m-0'><i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></h6></td>";
 						echo " </tr>";
diff --git a/app/Views/sampling/dashboard_viewAccess.php b/app/Views/sampling/dashboard_viewAccess.php
index 3877010..532ece9 100644
--- a/app/Views/sampling/dashboard_viewAccess.php
+++ b/app/Views/sampling/dashboard_viewAccess.php
@@ -63,7 +63,7 @@ if(isset($data[0])) {
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printAllLabel(<?=$accessnumber;?>, <?=$usercityid;?>)"> <h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6> </button> 
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collectAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Coll.</h6></button> 
 								<!-- <button class='badge bg-black text-white m-0 px-2 py-1' onclick='uncollectAll(<?=$accessnumber;?>)'>un-collect</button> -->
-								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
+								<!-- <button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>  -->
 							</td>
 						</tr>
 						<tr> 
@@ -99,7 +99,7 @@ if(isset($data[0])) {
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype, $usercityid)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
 								<button type='button' class='btn btn-warning m-0 px-2 py-1' onclick='uncollect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Coll.</h6></button> 
-								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
+								<!-- <button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> --> 
 							</td> ";
 						echo "<td id='comment$sampletype'>$comment <h6 class='p-0 m-0'><i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></h6></td>";
 						echo " </tr>";
diff --git a/app/Views/user/dashboard_viewAccess.php b/app/Views/user/dashboard_viewAccess.php
index 3877010..532ece9 100644
--- a/app/Views/user/dashboard_viewAccess.php
+++ b/app/Views/user/dashboard_viewAccess.php
@@ -63,7 +63,7 @@ if(isset($data[0])) {
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick="printAllLabel(<?=$accessnumber;?>, <?=$usercityid;?>)"> <h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6> </button> 
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collectAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Coll.</h6></button> 
 								<!-- <button class='badge bg-black text-white m-0 px-2 py-1' onclick='uncollectAll(<?=$accessnumber;?>)'>un-collect</button> -->
-								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
+								<!-- <button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>  -->
 							</td>
 						</tr>
 						<tr> 
@@ -99,7 +99,7 @@ if(isset($data[0])) {
 								<button type='button' class='btn btn-dark m-0 px-2 py-1' " . "onclick='printSingleLabel($accessnumber, $sampletype, $usercityid)'" . "><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
 								<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
 								<button type='button' class='btn btn-warning m-0 px-2 py-1' onclick='uncollect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Coll.</h6></button> 
-								<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> 
+								<!-- <button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button> --> 
 							</td> ";
 						echo "<td id='comment$sampletype'>$comment <h6 class='p-0 m-0'><i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></h6></td>";
 						echo " </tr>";
diff --git a/public/assets/css/pdf_new.css b/public/assets/css/pdf_new.css
index a14d724..0096917 100644
--- a/public/assets/css/pdf_new.css
+++ b/public/assets/css/pdf_new.css
@@ -61,6 +61,10 @@ table {
 	margin-left: auto; 
 	margin-right: auto;
 }
+.t_right {
+	margin-left: auto;
+}
+
 th,td { 
 	/* padding-left: 1rem; */
 	padding-top: 4px;
@@ -69,9 +73,25 @@ th,td {
 	border: 1px solid rgb(0, 0, 0);
 }
 
+th.khusus-kanan {
+	border-right: none;
+}
+th.khusus-kiri {
+	border-left: none;
+}
+
 th.left-pad, td.left-pad {
 	padding-left: 0.5rem;
 }
+td.right-pad {
+	padding-right: 0.5rem;
+	text-align: right;
+}
+td.center-pad {
+	text-align: center;
+}
+
+
 
 .result th,td { 
 	line-height: 1.1 ;