diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php
index 3c976af..942c5f2 100644
--- a/app/Helpers/custom.php
+++ b/app/Helpers/custom.php
@@ -1615,14 +1615,14 @@ if (!function_exists('formKriteria')) {
             }
         }
 
-        $link = Penilaian::where('key','upload_files')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
-        $linkLabel = Penilaian::where('key','upload_files_label')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
+        $link = Penilaian::where('tahun',$tahun)->where('key','upload_files')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
+        $linkLabel = Penilaian::where('tahun',$tahun)->where('key','upload_files_label')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
         // $valueLink = json_decode(@$link->value);
         // $valueLinkLabel = json_decode(@$linkLabel->value);
 
         // $valueLink = PenilaianFile::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('tahun',$kuesioner->tahun)->orderBy('key_option','ASC')->get();
 
-        $catatan = Penilaian::where('key','catatan')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first();
+        $catatan = Penilaian::where('tahun',$tahun)->where('key','catatan')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->orderBy('status','DESC')->first();
         $valueCatatan = json_decode(@$catatan->value);
 
         $kriteriaFirst = FormKriteria::where('tahun',$tahun)->where('page_number',$page_number)->first();
@@ -1789,7 +1789,7 @@ if (!function_exists('formKriteria')) {
                 $html .= '</div>';
             $html .= '</div>';
 
-            $checkFile = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)
+            $checkFile = Penilaian::where('tahun',$tahun)->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)
                 ->where('key','upload_files_penilai')
                 ->first();
                 $valueFile = json_decode(@$checkFile->value);