diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll
index 8136c0b..851920a 100644
Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ
diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
index 97121d2..6aae87d 100644
Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
index b480e60..df41e90 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6e62fa7286b6b12a29da4e3d3e0ce85b182d6a60")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6c1f04df78937e636bd70f79df58291ce6edc1cc")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
index b2830e2..7325404 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-8cd7fbdf30baf77c173986a19cc5803e8f0a84750631bb0aeabe5166b42b3225
+a144da6608c851b1d77cf2de93fc54f24e26f4cb43ce38d216d2c1f7f96d4042
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
index b480e60..df41e90 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6e62fa7286b6b12a29da4e3d3e0ce85b182d6a60")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6c1f04df78937e636bd70f79df58291ce6edc1cc")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
index b2830e2..7325404 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-8cd7fbdf30baf77c173986a19cc5803e8f0a84750631bb0aeabe5166b42b3225
+a144da6608c851b1d77cf2de93fc54f24e26f4cb43ce38d216d2c1f7f96d4042
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
index 7e71ab8..af7ab21 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
@@ -1 +1 @@
-fd69829476f96ca4d25120b43521716882b29f08424f3ff35a6ecf0b4441d3a0
+d30dc8b7ea8608759be70ee39f102c2c0df4dd6b8fe38952833d0ab88d7f2c9c
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll
index 8136c0b..851920a 100644
Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
index 97121d2..6aae87d 100644
Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ
diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info
index 3627f5f..4e16e27 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17249914374724023
\ No newline at end of file
+17254250168059839
\ No newline at end of file
diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info
index 4e16e27..49bc6e6 100644
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17254250168059839
\ No newline at end of file
+17254270391808934
\ No newline at end of file
diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
index c847e45..f398cb6 100644
--- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="09/04/2024 11:43:00" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="09/04/2024 12:12:45" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -107,7 +107,7 @@
       <TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม [budget_expenditure_report_from_revenue_v2.academic_year_1] - 30 กันยายน [budget_expenditure_report_from_revenue_v2.academic_year_2] )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue_v2.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <DataBand Name="Data3" Top="212.2" Width="945" Height="28.35" CanShrink="true" DataSource="details">
-        <TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
+        <TextObject Name="Text69" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic16]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
         <TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic2]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold, Underline" TextFill.Color="32, 55, 100"/>
         <TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>
         <TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
@@ -136,21 +136,19 @@
         <TextObject Name="Text45" Left="179.55" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no5]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text46" Left="217.35" Width="255.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic12]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text47" Left="472.5" Width="75.6" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount12]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text49" Left="207.9" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no6][budget_expenditure_report_from_revenue_v2.details.text19]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text50" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic13]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text51" Left="472.5" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount13]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text53" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text13]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text49" Left="151.2" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no6][budget_expenditure_report_from_revenue_v2.details.text19]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        <TextObject Name="Text50" Left="179.55" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic13]" VertAlign="Center" Font="TH Sarabun New, 11pt" Wysiwyg="true"/>
+        <TextObject Name="Text51" Left="472.5" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount13]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
         <TextObject Name="Text54" Left="472.5" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text14]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text55" Left="529.2" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text15]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text56" Left="595.35" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text16]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text57" Left="689.85" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text17]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text58" Left="595.35" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount14]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text59" Left="689.85" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount15]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
-        <TextObject Name="Text60" Left="756" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text18]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text58" Left="595.35" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount14]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        <TextObject Name="Text59" Left="689.85" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount15]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        <TextObject Name="Text60" Left="756" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text18]" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
         <TextObject Name="Text61" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount16]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text62" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic14]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text63" Left="793.8" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text20]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
-        <TextObject Name="Text42" Left="179.55" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic11]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
         <TextObject Name="Text64" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic15]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no7][budget_expenditure_report_from_revenue_v2.details.text22]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text66" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount17]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
@@ -164,18 +162,20 @@
         <TextObject Name="Text24" Left="548.1" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount5]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text43" Left="519.75" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount11]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
         <TextObject Name="Text68" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic17]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
-        <TextObject Name="Text52" Left="529.2" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.unit]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text52" Left="529.2" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.unit]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
         <TextObject Name="Text48" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text12]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
         <TextObject Name="Text20" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount4]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
         <TextObject Name="Text73" Left="642.6" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount18]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text74" Left="170.1" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no9][budget_expenditure_report_from_revenue_v2.details.text26]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
-        <TextObject Name="Text75" Left="198.45" Width="274.05" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic18]" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
         <TextObject Name="Text77" Left="519.75" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text25]" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
         <TextObject Name="Text76" Left="425.25" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount20]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
         <TextObject Name="Text78" Left="75.6" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no8]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         <TextObject Name="Text79" Left="37.8" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no10]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-        <TextObject Name="Text69" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic16]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
+        <TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
         <TextObject Name="Text29" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic5]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
+        <TextObject Name="Text53" Left="245.7" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text13]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+        <TextObject Name="Text75" Left="198.45" Width="274.05" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic18]" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
+        <TextObject Name="Text42" Left="179.55" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic11]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
       </DataBand>
     </DataBand>
   </ReportPage>