diff --git a/app/Http/Controllers/Dokter/Order/PeresepanObatController.php b/app/Http/Controllers/Dokter/Order/PeresepanObatController.php
index 427e59c..68ce781 100644
--- a/app/Http/Controllers/Dokter/Order/PeresepanObatController.php
+++ b/app/Http/Controllers/Dokter/Order/PeresepanObatController.php
@@ -175,10 +175,10 @@ class PeresepanObatController extends Controller
                     ->where('apd.norec',$request->noregistrasifk)
                     ->first();
 
-            $newId      =  DB::connection('smart')->table('strukorder_t')->where('noorder','like',date('Ym').'%')->max('noorder');
+            $newId      =  DB::connection('smart')->table('strukorder_t')->where('noorder','like',date('ym').'%')->max('noorder');
             $newId      = substr(trim($newId),4);
             $newId      = (int)$newId + 1;
-            $noOrder    = date('Ym'). str_pad($newId, 6, "0", STR_PAD_LEFT);
+            $noOrder    = date('ym'). str_pad($newId, 6, "0", STR_PAD_LEFT);
 
             $strukOrder = [
                 'norec' => $this->generateNorecSmartV1(),
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 9839163..ee95158 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -23,6 +23,9 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        \Illuminate\Support\Facades\URL::forceScheme('https');
+        if(env('APP_ENV') === 'production'){
+            \Illuminate\Support\Facades\URL::forceScheme('https');
+        }
+        
     }
 }
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index fc00112..97ef8f0 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -21,13 +21,13 @@
                               <div class="col-lg-12">
                                  <div class="form-group">
                                     <label for="email" class="form-label">Username</label>
-                                    <input id="email" type="text" name="email" class="form-control"  placeholder="Masukkan Username" required autofocus>
+                                    <input id="email" type="text" name="email" class="form-control"  placeholder="Masukkan Username" required autofocus autocomplete="off">
                                  </div>
                               </div>
                               <div class="col-lg-12">
                                  <div class="form-group">
                                     <label for="password" class="form-label">Password</label>
-                                    <input class="form-control" type="password" placeholder="********"  name="password" required autocomplete="current-password">
+                                    <input class="form-control" type="password" placeholder="********"  name="password" required>
                                  </div>
                               </div>
                               <!--
diff --git a/resources/views/dokter/emr/form/soap.blade.php b/resources/views/dokter/emr/form/soap.blade.php
index a74d2b2..6136cf1 100644
--- a/resources/views/dokter/emr/form/soap.blade.php
+++ b/resources/views/dokter/emr/form/soap.blade.php
@@ -73,7 +73,7 @@
    </div>
 
     <div class="row">
-        <div class="col-sm-12 col-lg-6">
+        <div class="col-12 col-sm-12 col-xs-12 col-lg-6">
             <a href="{{route('dokter.emr.soap.view', ['pdnorec' => $data['pdnorec']])}}">
                 <div class="card btn btn-warning col-sm-12 col-lg-12">SOAP</div>
             </a>
@@ -89,23 +89,21 @@
       <div class="col-sm-12 col-lg-12">
          <div class="card">
             <div class="card card-body">
-                <div class="card-header d-flex justify-content-between">
-                    <div class="col-md-12">
-                        <div class="d-flex justify-content-between align-items-center flex-wrap">
-                           <div><h1>SOAP</h1></div>
-                           <div>
-                              @if(strtotime(date('d-m-Y', strtotime( $data['pasien_identitas']->tglregistrasi ))) == strtotime(date('d-m-Y')) )                           
-                                 <a href="{{route('dokter.emr.soap.form', ['pdnorec' => $data['pdnorec']])}}">
-                                    <div class="card btn btn-warning col-sm-12 col-lg-12">Tambah SOAP</div>
-                                 </a>
-                              @else 
-                                 <div class="card btn btn-secondary col-sm-12 col-lg-12">Tambah SOAP</div>
-                              @endif
-                           </div>
-                        </div>
-                    </div>                    
-                </div>
-                <div class="card-body">
+               <div class="card-body">
+                  <div class="row">
+                     <div class="col-12 col-sm-12 col-xs-12 col-lg-10">
+                        <h1>LIST SOAP PASIEN</h1>
+                     </div>
+                     <div class="col-sm-12 col-lg-2">
+                        @if(strtotime(date('d-m-Y', strtotime( $data['pasien_identitas']->tglregistrasi ))) == strtotime(date('d-m-Y')) )                           
+                           <a href="{{route('dokter.emr.soap.form', ['pdnorec' => $data['pdnorec']])}}">
+                              <div class="card btn btn-info col-lg-6 col-12">Tambah SOAP</div>
+                           </a>
+                        @else 
+                           <div class="card btn btn-secondary col-sm-6 col-lg-6 col-12">Tambah SOAP</div>
+                        @endif
+                     </div>
+                  </div>
                         @if ($errors->any())
                             <div class="alert alert-danger">
                                 <ul>
@@ -116,6 +114,7 @@
                             </div>
                         @endif
                     <div class="table-responsive mt-4">
+                        <label class="text-danger">* Hanya Menampilkan 10 Riwayat Terakhir</label>
                         <table id="basic-table" class="table table-striped mb-0" role="grid">
                         <thead>
                             <tr>
diff --git a/resources/views/dokter/list-pasien-telekonsultasi.blade.php b/resources/views/dokter/list-pasien-telekonsultasi.blade.php
index 0904d3e..fc0fe8a 100644
--- a/resources/views/dokter/list-pasien-telekonsultasi.blade.php
+++ b/resources/views/dokter/list-pasien-telekonsultasi.blade.php
@@ -58,10 +58,10 @@
                   <div class="card-body">
                      <form method="GET"  data-toggle="validator">
                         <div class="row">
-                           <div class="form-group col-8">
+                           <div class="form-group col-lg-8 col-sm-12">
                               <input type="date" class="form-control" name="tanggal" required>                              
                            </div>
-                           <div class="form-group col-4">
+                           <div class="form-group col-lg-4 col-sm-12">
                               <button  type="submit" class="btn bg-success text-light col-12">Cari </button>
                            </div>
                         </div>
diff --git a/resources/views/dokter/order/form/resep-form.blade.php b/resources/views/dokter/order/form/resep-form.blade.php
index cc9e77a..99b872b 100644
--- a/resources/views/dokter/order/form/resep-form.blade.php
+++ b/resources/views/dokter/order/form/resep-form.blade.php
@@ -220,11 +220,11 @@
                                 <label for="daysOfWeekHighlighted" class="label fw-bold">Subtitusi Obat</label>
                                 <div>
                                     <div class="form-check form-check-inline">
-                                        <input type="radio" class="form-check-input" id="sibtitusiYa" name="subtitusi" value="Ya" checked>
+                                        <input type="radio" class="form-check-input" id="sibtitusiYa" name="subtitusi" value="Ya">
                                         <label for="sibtitusiYa" class="form-check-label">Ya</label>
                                     </div>
                                     <div class="form-check form-check-inline">
-                                        <input type="radio" class="form-check-input" id="subtitusiTidak" name="subtitusi" value="Tidak">
+                                        <input type="radio" class="form-check-input" id="subtitusiTidak" name="subtitusi" value="Tidak" checked>
                                         <label for="subtitusiTidak" class="form-check-label">Tidak</label>
                                     </div>
                                 </div>
@@ -383,7 +383,7 @@
                  <div class="row">
                     <div class="form-group col-8">
                         <label class="form-label fw-bold">Nama Obat</label>
-                        <select class="select2-basic-single2 js-states form-select form-control select-obat-racikan" id="namaObatNonRacikan" name="" data-live-search="true" required style="width: 100%;" required>
+                        <select class="select2-basic-single js-states form-select form-control select-obat-racikan" id="namaObatNonRacikan" name="" data-live-search="true" required style="width: 100%;" required>
                             @foreach($data['master_obat'] as $resultRow)
                                 <option value="{{$resultRow->id}}">{{ $resultRow->namaproduk }}</option>
                             @endforeach
@@ -400,6 +400,7 @@
                 </div>
             `
         );
+
         $(".select2-basic-single").select2('destroy');
         $(".select2-basic-single").select2();
     });
diff --git a/resources/views/dokter/order/form/resep.blade.php b/resources/views/dokter/order/form/resep.blade.php
index 40c98d1..5d4d6e5 100644
--- a/resources/views/dokter/order/form/resep.blade.php
+++ b/resources/views/dokter/order/form/resep.blade.php
@@ -89,24 +89,24 @@
       <div class="col-sm-12 col-lg-12">
          <div class="card">
             <div class="card card-body">
-                <div class="card-header d-flex justify-content-between">
-                     <div class="col-md-12">
-                        <div class="d-flex justify-content-between align-items-center flex-wrap">
-                              <div><h1>Peresepan Obat</h1></div>
-                              <div>
-                                 @if(strtotime(date('d-m-Y', strtotime( $data['pasien_identitas']->tglregistrasi ))) == strtotime(date('d-m-Y')) )                           
-                                 <a href="{{route('dokter.emr.resep.form', ['pdnorec' => $data['pdnorec']])}}">
-                                    <div class="card btn btn-warning col-sm-12 col-lg-12">Tambah Resep</div>
-                                 </a>
-                                 @else 
-                                    <div class="card btn btn-secondary col-sm-12 col-lg-12">Tambah Resep</div>
-                                 @endif
-                              </div>
-                        </div>         
-                     </div>           
-                </div>
+                  <div class="row">
+                     <div class="col-12 col-sm-12 col-xs-12 col-lg-10">
+                        <h1>Riwayat Peresepan Obat</h1>
+                     </div>
+                     <div class="col-sm-12 col-lg-2">
+                        @if(strtotime(date('d-m-Y', strtotime( $data['pasien_identitas']->tglregistrasi ))) == strtotime(date('d-m-Y')) )                           
+                           <a href="{{route('dokter.emr.resep.form', ['pdnorec' => $data['pdnorec']])}}">
+                              <div class="card btn btn-info col-sm-12 col-lg-12">Tambah Resep</div>
+                           </a>
+                        @else 
+                           <div class="card btn btn-secondary col-sm-6 col-sm-12 col-lg-12">Tambah SOAP</div>
+                        @endif
+                     </div>
+                  </div>
+                
                 <div class="card-body">                    
                 <div class="table-responsive mt-4">
+                  <label class="text-danger">* Hanya Menampilkan Riwayat 10 Resep Terakhir</label>
                     <table id="basic-table" class="table table-striped mb-0" role="grid">
                     <thead>
                         <tr>
diff --git a/resources/views/partials/dashboard/_body_header.blade.php b/resources/views/partials/dashboard/_body_header.blade.php
index 55a2bad..957875a 100644
--- a/resources/views/partials/dashboard/_body_header.blade.php
+++ b/resources/views/partials/dashboard/_body_header.blade.php
@@ -1,12 +1,6 @@
 <nav class="nav navbar navbar-expand-lg navbar-light iq-navbar">
   <div class="container-fluid navbar-inner">
     <a href="{{route('dashboard')}}" class="navbar-brand">
-      <svg width="30" class="text-primary" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <rect x="-0.757324" y="19.2427" width="28" height="4" rx="2" transform="rotate(-45 -0.757324 19.2427)" fill="currentColor"/>
-        <rect x="7.72803" y="27.728" width="28" height="4" rx="2" transform="rotate(-45 7.72803 27.728)" fill="currentColor"/>
-        <rect x="10.5366" y="16.3945" width="16" height="4" rx="2" transform="rotate(45 10.5366 16.3945)" fill="currentColor"/>
-        <rect x="10.5562" y="-0.556152" width="28" height="4" rx="2" transform="rotate(45 10.5562 -0.556152)" fill="currentColor"/>
-      </svg>
       <h4 class="logo-title">{{env('APP_NAME')}}</h4>
     </a>
     <div class="sidebar-toggle" data-toggle="sidebar" data-active="true">