diff --git a/htdocs/app/Http/Controllers/ListController.php b/htdocs/app/Http/Controllers/ListController.php
index e983fedf..0855998b 100644
--- a/htdocs/app/Http/Controllers/ListController.php
+++ b/htdocs/app/Http/Controllers/ListController.php
@@ -578,7 +578,7 @@ class ListController extends Controller
         $lokasi     = $request->input('lokasi');
         $valcari    = $request->input('valcari');
         $master     = $request->input('master');
-		$query 		= Periksa::select(
+		$arraylist 	= Periksa::select(
 							'id', 'mulai', 'akhir', 'orderid', 'noloket', 'nofoto', 'noregister', 'asalpasien', 'nmrs', 'pasien_id', 'nmpasien',
 							'jkpasien', 'tgllahirpasien', 'tlppasien', 'alamatpasien', 'reques', 'usia', 'berat', 'ktp', 'bpjs', 'ruangan_id',
 							'ruangan', 'dokter_id', 'ppdssenior', 'middleppds', 'ppdsjunior', 'ppdsmiddle2', 'ppdsjunior2', 'analis', 'excutor',
@@ -682,8 +682,48 @@ class ListController extends Controller
 								ELSE CONCAT('<font color=red>', reques::text, '</font>')
 							END AS tlsreques")
 						);
-            $query->orderBy('id', 'DESC');
-            return DataTables::of($query)
+			if ($jenis == 'ThisDay') {
+				$arraylist = $arraylist->where(function($q) {
+								$q->where(function($sub) {
+									$sub->whereNotIn('status', ['Selesai', 'Arsip'])
+										->where('status', 'not like', 'Dibatalkan%');
+								})->orWhereNull('status');
+							});
+			} else if ($jenis == 'ThisDayPendaftaran') {
+				$arraylist = $arraylist->whereDate('daftar', Carbon::today());
+			} else if ($jenis == 'mundur2') {
+				$arraylist = $arraylist->whereDate('daftar', '>=', Carbon::today()->subDays(2));
+			} else if ($jenis == 'mundur3') {
+				$arraylist = $arraylist->whereDate('daftar', '>=', Carbon::today()->subDays(3));
+			} else if ($jenis === 'searchbydate') {
+				$mulai = $mulai ?: date("Y-m-d");
+				$akhir = $akhir ?: date("Y-m-d");
+				if ($mulai >= $akhir) {
+					$akhir = date('Y-m-d', strtotime($akhir . ' +1 day'));
+				}
+				$arraylist = $arraylist->whereBetween('daftar', [$mulai, $akhir]);
+			} else if ($jenis === 'searchbydatemanual') {
+				$mulai = $mulai ?: date("Y-m-d");
+				$akhir = $akhir ?: date("Y-m-d");
+				if ($mulai >= $akhir) {
+					$akhir = date('Y-m-d', strtotime($akhir . ' +1 day'));
+				}
+				$arraylist = $arraylist->whereBetween('daftar', [$mulai, $akhir])->whereNotIn('pendaftar', ['supervisor', 'admin', 'analis', 'ppds', 'developer']);
+			} else if ($jenis === 'norm'){
+				$arraylist = $arraylist->where('noregister', 'LIKE', '%'.$valcari.'%');
+			} else if ($jenis === 'nofoto'){
+				$arraylist = $arraylist->where('nofoto', 'LIKE', '%'.$valcari.'%');
+			} else if ($jenis === 'rekues'){
+				$arraylist = $arraylist->where('reques', 'LIKE', '%'.$valcari.'%');
+			} else if ($jenis === 'keterangan'){
+				$arraylist = $arraylist->where('keterangan', 'LIKE', '%'.$valcari.'%');
+			} else if ($jenis === 'kesimpulan'){
+				$arraylist = $arraylist->where('kesimpulan', 'LIKE', '%'.$valcari.'%');
+			} else {
+				$arraylist = $arraylist->where('nmpasien', 'LIKE', '%'.$valcari.'%');
+			}
+            $arraylist->orderBy('id', 'DESC');
+            return DataTables::of($arraylist)
                     ->addColumn('aksi', function ($row) {
                         return '
                         <div class="btn-group-vertical mb-2">
@@ -692,7 +732,7 @@ class ListController extends Controller
                             </button>
                         </div>';
                     })
-                    ->rawColumns(['aksi'])
+                    ->rawColumns(['aksi', 'tlsstatus', 'tlsnofoto', 'tlsnoregister', 'tlsnama', 'tlsreques'])
                     ->make(true);
         
 	}