diff --git a/Models/RoReport/teaching_fee_ro_three.cs b/Models/RoReport/teaching_fee_ro_three.cs
index 7bb4068..fc69e93 100644
--- a/Models/RoReport/teaching_fee_ro_three.cs
+++ b/Models/RoReport/teaching_fee_ro_three.cs
@@ -29,6 +29,7 @@ namespace rmutr_report.Models.RoThree
     public class teaching_fee_ro_three_data
     {
         public string display_name { get; set; }
+        public string subject_name_th { get; set; }
         public string position { get; set; }
         public decimal? disbursement_result { get; set; }
         public decimal? number_of_hours_ba_1 { get; set; }
diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
index 49a42ed..1791d49 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="10/11/2023 14:20:11" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="11/29/2023 14:23:03" 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"/>
@@ -88,7 +88,7 @@
       <LineObject Name="Line1" Left="85.05" Top="198.45" Width="472.5" Diagonal="true"/>
       <LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/>
       <TextObject Name="Text5" Top="170.1" Width="75.6" Height="37.8" Text="ภาค :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text8" Left="85.05" Top="170.1" Width="670.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <TextObject Name="Text8" Left="85.05" Top="170.1" Width="670.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text9" Left="765.45" Top="170.1" Width="132.3" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text10" Left="897.75" Top="170.1" Width="47.25" Height="37.8" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <LineObject Name="Line2" Left="85.05" Top="160.65" Width="472.5" Diagonal="true"/>
@@ -98,7 +98,7 @@
       <TextObject Name="Text6" Left="85.05" Top="94.5" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" 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="213.38" Width="945" Height="28.35" CanShrink="true" DataSource="details">
+      <DataBand Name="Data3" Top="213.09" 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, 18pt, style=Bold" TextFill.Color="0, 32, 96"/>
         <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, 18pt, 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" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>
diff --git a/wwwroot/reports/teaching_fee.frx b/wwwroot/reports/teaching_fee.frx
index 5ceee82..74293d9 100644
--- a/wwwroot/reports/teaching_fee.frx
+++ b/wwwroot/reports/teaching_fee.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/28/2023 15:40:58" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/29/2023 16:09:11" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="teaching_fee_ro_three" ReferenceName="teaching_fee_ro_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -12,6 +12,7 @@
       <Column Name="disbursement_result_year" DataType="System.String"/>
       <Column Name="disbursement_result_semester" DataType="System.String"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
+        <Column Name="subject_name_th" DataType="System.String"/>
         <Column Name="display_name" DataType="System.String"/>
         <Column Name="position" DataType="System.String"/>
         <Column Name="disbursement_result" DataType="System.Decimal"/>
@@ -86,7 +87,7 @@
           <TableCell Name="Cell75" Border.Lines="All" Text="(2) = (1) x อัตราค่าสอนต่อชั่วโมง" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data2" Top="165.36" Width="1436.4" Height="47.25" DataSource="data">
+      <DataBand Name="Data2" Top="165.84" Width="1436.4" Height="47.25" DataSource="data">
         <TableObject Name="Table3" Width="1285.24" Height="47.25">
           <TableColumn Name="Column25" Width="56.72"/>
           <TableColumn Name="Column26" Width="396.92"/>
@@ -99,7 +100,7 @@
           <TableColumn Name="Column77" Width="85.05"/>
           <TableRow Name="Row3" Height="47.25">
             <TableCell Name="Cell25" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
-            <TableCell Name="Cell26" Border.Lines="All" Text="[teaching_fee_ro_three.data.display_name]" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell26" Border.Lines="All" Text="[teaching_fee_ro_three.data.subject_name_th]" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
             <TableCell Name="Cell27" Border.Lines="All" Text="[teaching_fee_ro_three.data.position]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
             <TableCell Name="Cell28" Border.Lines="All" Text="[teaching_fee_ro_three.data.disbursement_result]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
             <TableCell Name="Cell29" Border.Lines="All" Text="[teaching_fee_ro_three.data.number_of_hours_ba_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
@@ -110,7 +111,7 @@
           </TableRow>
         </TableObject>
       </DataBand>
-      <DataFooterBand Name="DataFooter1" Top="217.31" Width="1436.4" Height="47.25">
+      <DataFooterBand Name="DataFooter1" Top="218.29" Width="1436.4" Height="47.25">
         <TableObject Name="Table8" Width="1285.24" Height="47.25">
           <TableColumn Name="Column46" Width="453.62"/>
           <TableColumn Name="Column47" Width="198.47"/>
diff --git a/wwwroot/reports/teaching_fee_extra.frx b/wwwroot/reports/teaching_fee_extra.frx
index 8218531..72c40c4 100644
--- a/wwwroot/reports/teaching_fee_extra.frx
+++ b/wwwroot/reports/teaching_fee_extra.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/21/2023 16:04:08" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/29/2023 16:09:29" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="teaching_fee_extra_ro_three" ReferenceName="teaching_fee_extra_ro_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -119,7 +119,7 @@
         <TableColumn Name="Column139" Width="85.05"/>
         <TableColumn Name="Column140" Width="94.5"/>
         <TableRow Name="Row15" Height="47.25">
-          <TableCell Name="Cell124" Border.Lines="Left, Top, Bottom" Text="อาจารย์พิเศษภาคการศึกษา 2" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+          <TableCell Name="Cell124" Border.Lines="Left, Top, Bottom" Text="อาจารย์พิเศษภาคการศึกษา [teaching_fee_extra_ro_three.semester]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
           <TableCell Name="Cell125" Border.Lines="Top, Bottom" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
           <TableCell Name="Cell126" Border.Lines="Top, Bottom" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
           <TableCell Name="Cell127" Border.Lines="Top, Bottom" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
@@ -138,7 +138,7 @@
           <TableCell Name="Cell140" Border.Lines="Right, Top, Bottom" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data2" Top="328.85" Width="2003.4" Height="47.25" DataSource="data">
+      <DataBand Name="Data2" Top="326.49" Width="2003.4" Height="47.25" DataSource="data">
         <TableObject Name="Table3" Width="2003.44" Height="47.25">
           <TableColumn Name="Column25" Width="179.57"/>
           <TableColumn Name="Column26" Width="236.27"/>
@@ -178,7 +178,7 @@
           </TableRow>
         </TableObject>
       </DataBand>
-      <DataFooterBand Name="DataFooter1" Top="383.64" Width="2003.4" Height="47.25">
+      <DataFooterBand Name="DataFooter1" Top="378.94" Width="2003.4" Height="47.25">
         <TableObject Name="Table14" Width="2003.44" Height="47.25">
           <TableColumn Name="Column107" Width="179.57"/>
           <TableColumn Name="Column108" Width="236.27"/>