diff --git a/htdocs/app/Http/Controllers/Controller.php b/htdocs/app/Http/Controllers/Controller.php
index 4f7b07ac..bcf2b43d 100644
--- a/htdocs/app/Http/Controllers/Controller.php
+++ b/htdocs/app/Http/Controllers/Controller.php
@@ -178,16 +178,14 @@ class Controller extends BaseController
     protected function getDefaultData($jenis, $master, $mulai, $akhir, $valcari) {
         $query = Periksa::whereNotNull('nofoto');
         if ($jenis == 'ThisDay') {
-            if (Session('previlage') == 'admin'){
-                return $query->whereDate('daftar', Carbon::today());
-            } else {
-                return $query->where(function($q) {
+            return $query->where(function($q) {
                             $q->where(function($sub) {
                                 $sub->where('status', '!=', 'Selesai')
                                     ->where('status', 'not like', 'Dibatalkan%');
                             })->orWhereNull('status');
                         });
-            }
+        } else if ($jenis == 'ThisDayPendaftaran') {
+            return $query->whereDate('daftar', Carbon::today());
         } else if ($jenis == 'mundur2') {
             return $query->whereDate('daftar', '>=', Carbon::today()->subDays(2));
         } else if ($jenis == 'mundur3') {
diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php
index 810c7eb2..35034dcc 100644
--- a/htdocs/resources/views/dokter/pemeriksaan.blade.php
+++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php
@@ -1821,7 +1821,7 @@
 						<div class="form-group setelahdipilihtemplate">
 							<input type="hidden" id="periksa_id" name="periksa_id">
 							<button type="button" id="btnkembali" class="btn btn-primary">Back</button>
-							<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Save Expertise</button>
+							<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Final Expertise</button>
 							<button type="button" id="btnsavedraft" class="btn btn-success pull-right">Save as Draft</button>
 						</div>
 						<div class="form-group setelahdipilihtemplate">
@@ -2204,7 +2204,7 @@
 		var akhir	= '';
 		var valcari	= '';
 		var master	= document.getElementById('master_lokasi').value;
-		var poli	= '';
+		var poli	= document.getElementById('master_userid').value;
 		var set06	= document.getElementById('master_judul').value;
 		var token	= document.getElementById('token').value;
 		if (jenis == 'ThisDay'){
@@ -2301,7 +2301,7 @@
 				{ name: 'alamat', type: 'text'},
 			],
 			type		: 'GET',
-			data		: {jenis:jenis, mulai:mulai, akhir:akhir, valcari:valcari, poli:poli, master:master, _token: token},
+			data		: {jenis:'verificationppds', mulai:mulai, akhir:akhir, valcari:valcari, poli:poli, master:'verificationppds', _token: token},
 			url			: '{{ route("getList") }}',
 		};
 		var dataAdapter = new $.jqx.dataAdapter(sourcepasiencari);
@@ -2752,40 +2752,12 @@
 		$('#divperiksa').hide();
 		$('#divreadonly').hide();
 		$('#divharibytanggal').hide();
-		$("#btnhariinidoank").click(function() {
-			$("#master_set01").val('ThisDay');
-			$("#master_set02").val('');
-			$("#master_set03").val('');
-			$("#master_set04").val('');
-			var set01=document.getElementById('master_judul').value;
-			var judul='Patient Queue This Day on '+set01;
-			$("#judul").html(judul);
-			$("#valcari").val('');
-			$("#mulai").val('');
-			$("#akhir").val('');
-			$("#valjenis").val('searchbydate');
+		$("#btnpunyaku").click(function() {
+			$("#master_userid").val("{{ Session('id') }}");
 			openedpage();
 		});
-		$("#btnmundur2").click(function() {
-			$("#master_set01").val('mundur2');
-			$("#master_set02").val('');
-			$("#master_set03").val('');
-			$("#master_set04").val('');
-			$("#valcari").val('');
-			$("#mulai").val('');
-			$("#akhir").val('');
-			$("#valjenis").val('searchbydate');
-			openedpage();
-		});
-		$("#btnmundur3").click(function() {
-			$("#master_set01").val('mundur3');
-			$("#master_set02").val('');
-			$("#master_set03").val('');
-			$("#master_set04").val('');
-			$("#valcari").val('');
-			$("#mulai").val('');
-			$("#akhir").val('');
-			$("#valjenis").val('searchbydate');
+		$("#btnallspv").click(function() {
+			$("#master_userid").val('allspv');
 			openedpage();
 		});
 		$("#btnkembali").click(function() {
diff --git a/htdocs/resources/views/pendaftaran.blade.php b/htdocs/resources/views/pendaftaran.blade.php
index 21c6ab1d..51910e18 100644
--- a/htdocs/resources/views/pendaftaran.blade.php
+++ b/htdocs/resources/views/pendaftaran.blade.php
@@ -365,7 +365,7 @@
 	</div><!-- /.modal-dialog -->
 </div>
 <input type="hidden" name="_token" id="token" value="{{ csrf_token() }}">
-<input type="hidden" id="master_set01" name="master_set01" value="ThisDay">
+<input type="hidden" id="master_set01" name="master_set01" value="ThisDayPendaftaran">
 <input type="hidden" id="master_set02" name="master_set02" value="{{ Session('previlage') }}">
 <input type="hidden" id="master_set03" name="master_set03" value="">
 <input type="hidden" id="master_set04" name="master_set04" value="">
@@ -468,7 +468,7 @@
 		var akhir	= document.getElementById('akhir').value;
 		var valcari	= document.getElementById('valcari').value;
 		var master	= 'mikro';
-		var poli	= '';
+		var poli	= 'pendaftaran';
 		var set06	= '';
 		var token	= document.getElementById('token').value;
 		var sourcepasiencari = {
@@ -940,7 +940,7 @@
 			openedpage();
 		});
 		$("#btnhariinidoank").click(function() {
-			$("#master_set01").val('ThisDay');
+			$("#master_set01").val('ThisDayPendaftaran');
 			$("#master_set02").val('');
 			$("#master_set03").val('');
 			$("#master_set04").val('');