Update htdocs/app/Services/AstmMessageService.php

htdocs/app/Http/Controllers/Controller.php

@@ -1,5 +1,6 @@
 <?php
 namespace App\Http\Controllers;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
@@ -10,6 +11,7 @@ use App\Pasien;
 use App\Riwayat;
 use App\Rekaplogbook;
 use App\PeriksaTest;
+
 use Fawno\PhpSerial\SerialDio;
 use Fawno\PhpSerial\SerialConfig;
 use DateTime;
@@ -25,6 +27,7 @@ use Aranyasen\HL7\Segments\PID;
 use Aranyasen\HL7\Segments\OBX;
 use Aranyasen\HL7\Segments\NTE;
 use Aranyasen\HL7\Segments\EVN;
+use Session;
 
 class Controller extends BaseController
 {
@@ -175,10 +178,7 @@ class Controller extends BaseController
     protected function getDefaultData($jenis, $master, $mulai, $akhir, $valcari) {
         $query = Periksa::whereNotNull('nofoto');
         if ($jenis == 'ThisDay') {
-            $url        = url()->current();
-            $baseurl    = url('/');
-            $ceklaman   = str_replace($baseurl.'/', '', $url);
-            if ($ceklaman == 'pendaftaran'){
+            if (Session('previlage') == 'admin'){
                 return $query->whereDate('daftar', Carbon::today());
             } else {
                 return $query->where(function($q) {
@@ -187,7 +187,6 @@ class Controller extends BaseController
                         ->orWhere('status', 'not like', 'Dibatalkan%');
                     });
             }
-           
         } else if ($jenis == 'mundur2') {
             return $query->whereDate('daftar', '>=', Carbon::today()->subDays(2));
         } else if ($jenis == 'mundur3') {