diff --git a/wwwroot/reports/summary_budget_expense_1.frx b/wwwroot/reports/summary_budget_expense_1.frx
index 49409ff..cf40cf8 100644
--- a/wwwroot/reports/summary_budget_expense_1.frx
+++ b/wwwroot/reports/summary_budget_expense_1.frx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="03/03/2025 13:33:14" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
-    <BusinessObjectDataSource Name="summary_budget_expense" ReferenceName="summary_budget_expense" DataType="null" Enabled="true">
+    <BusinessObjectDataSource Name="summary_budget_expense_report" ReferenceName="summary_budget_expense_report" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
       <Column Name="agency_name_th" DataType="System.String"/>
       <Column Name="budget_plan_name_th" DataType="System.String"/>
@@ -30,8 +30,8 @@
   </Dictionary>
   <ReportPage Name="Page1" Landscape="true" PaperWidth="370" PaperHeight="210" Watermark.Font="Arial, 60pt">
     <ReportTitleBand Name="ReportTitle1" Width="1323" Height="236.25">
-      <TextObject Name="Text1" Width="1398.6" Height="28.35" Text="สรุปงบประมาณรายจ่าย ประจำปีงบประมาณ พ.ศ. [summary_budget_expense.budget_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text2" Top="28.35" Width="1398.6" Height="28.35" Text="พื้นที่ [summary_budget_expense.parent_agency_name] หน่วยงาน [summary_budget_expense.agency_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+      <TextObject Name="Text1" Width="1398.6" Height="28.35" Text="สรุปงบประมาณรายจ่าย ประจำปีงบประมาณ พ.ศ. [summary_budget_expense_report.budget_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+      <TextObject Name="Text2" Top="28.35" Width="1398.6" Height="28.35" Text="พื้นที่ [summary_budget_expense_report.parent_agency_name] หน่วยงาน [summary_budget_expense_report.agency_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
       <TableObject Name="Table9" Left="-9450" Top="-9450" Width="1247.4" Height="85.05">
         <TableColumn Name="Column45" Width="75.6"/>
         <TableColumn Name="Column46" Width="236.25"/>
@@ -76,7 +76,7 @@
           <TableCell Name="Cell63" Border.Lines="All" Text="ค่า&#13;&#10;ที่ดินและสิ่งก่อสร้าง" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text3" Top="56.7" Width="1398.6" Height="28.35" Text="[summary_budget_expense.budget_plan_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+      <TextObject Name="Text3" Top="56.7" Width="1398.6" Height="28.35" Text="[summary_budget_expense_report.budget_plan_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
       <TableObject Name="Table16" Left="340.2" Top="122.85" Width="245.7" Height="47.25">
         <TableColumn Name="Column81" Width="245.7"/>
         <TableRow Name="Row16" Height="47.25">
@@ -105,7 +105,7 @@
           <TableCell Name="Cell88" Border.Lines="All" Text="ค่าใช้จ่ายอื่น ๆ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text4" Top="85.05" Width="1398.6" Height="28.35" Text="[summary_budget_expense.budget_project_name]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+      <TextObject Name="Text4" Top="85.05" Width="1398.6" Height="28.35" Text="[summary_budget_expense_report.budget_project_name]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
     </ReportTitleBand>
     <DataBand Name="Data1" Top="242.31" Width="1323" Height="37.8">
       <TableObject Name="Table15" Width="1323" Height="37.8">
@@ -120,14 +120,14 @@
         <TableColumn Name="Column78" Width="122.85"/>
         <TableRow Name="Row15" Height="37.8">
           <TableCell Name="Cell70" Border.Lines="All" Text="รวมทั้งหมด" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell71" Border.Lines="All" Text="[summary_budget_expense.total_equipment]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell72" Border.Lines="All" Text="[summary_budget_expense.total_land_building]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell73" Border.Lines="All" Text="[summary_budget_expense.total_subsidy_university_staff]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell74" Border.Lines="All" Text="[summary_budget_expense.total_subsidy]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell75" Border.Lines="All" Text="[summary_budget_expense.total_operating_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell76" Border.Lines="All" Text="[summary_budget_expense.total_other_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell77" Border.Lines="All" Text="[summary_budget_expense.total_other_budget_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell78" Border.Lines="All" Text="[summary_budget_expense.total_all]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell71" Border.Lines="All" Text="[summary_budget_expense_report.total_equipment]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell72" Border.Lines="All" Text="[summary_budget_expense_report.total_land_building]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell73" Border.Lines="All" Text="[summary_budget_expense_report.total_subsidy_university_staff]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell74" Border.Lines="All" Text="[summary_budget_expense_report.total_subsidy]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell75" Border.Lines="All" Text="[summary_budget_expense_report.total_operating_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell76" Border.Lines="All" Text="[summary_budget_expense_report.total_other_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell77" Border.Lines="All" Text="[summary_budget_expense_report.total_other_budget_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell78" Border.Lines="All" Text="[summary_budget_expense_report.total_all]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
       <DataBand Name="Data2" Top="286.17" Width="1323" Height="37.8" DataSource="data">
@@ -142,15 +142,15 @@
           <TableColumn Name="Column97" Width="122.85"/>
           <TableColumn Name="Column98" Width="122.85"/>
           <TableRow Name="Row22" Height="37.8">
-            <TableCell Name="Cell90" Border.Lines="All" Text="[summary_budget_expense.data.budget_project_name_th]" AutoShrink="FontSize" AutoShrinkMinSize="12" VertAlign="Center" Font="TH Sarabun New, 14pt" Clip="false"/>
-            <TableCell Name="Cell91" Border.Lines="All" Text="[summary_budget_expense.data.equipment]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell92" Border.Lines="All" Text="[summary_budget_expense.data.land_building]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell93" Border.Lines="All" Text="[summary_budget_expense.data.subsidy_university_staff]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell94" Border.Lines="All" Text="[summary_budget_expense.data.subsidy]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell95" Border.Lines="All" Text="[summary_budget_expense.data.operating_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell96" Border.Lines="All" Text="[summary_budget_expense.data.other_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell97" Border.Lines="All" Text="[summary_budget_expense.data.other_budget_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell98" Border.Lines="All" Text="[summary_budget_expense.data.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell90" Border.Lines="All" Text="[summary_budget_expense_report.data.budget_project_name_th]" AutoShrink="FontSize" AutoShrinkMinSize="12" VertAlign="Center" Font="TH Sarabun New, 14pt" Clip="false"/>
+            <TableCell Name="Cell91" Border.Lines="All" Text="[summary_budget_expense_report.data.equipment]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell92" Border.Lines="All" Text="[summary_budget_expense_report.data.land_building]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell93" Border.Lines="All" Text="[summary_budget_expense_report.data.subsidy_university_staff]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell94" Border.Lines="All" Text="[summary_budget_expense_report.data.subsidy]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell95" Border.Lines="All" Text="[summary_budget_expense_report.data.operating_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell96" Border.Lines="All" Text="[summary_budget_expense_report.data.other_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell97" Border.Lines="All" Text="[summary_budget_expense_report.data.other_budget_expenses]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell98" Border.Lines="All" Text="[summary_budget_expense_report.data.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
           </TableRow>
         </TableObject>
       </DataBand>