diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs
index 698c7ac..3ea553f 100644
--- a/Controllers/Budget.Controller.cs
+++ b/Controllers/Budget.Controller.cs
@@ -2503,12 +2503,12 @@ namespace rmutr_report.Controllers
                             detail2.text1 = "อัตรา";
                         }
 
-                        // var cperson = detail.budget_personnel_lists.Count();
-                        //
-                        // if (cperson ==1)
-                        // {
-                        //     detail.budget_personnel_lists[0].topic = "งบบุคลากร";
-                        // }
+                        var cperson = detail.budget_personnel_lists.Count();
+                        
+                        if (cperson ==1)
+                        {
+                            detail.budget_personnel_lists[0].topic = "งบบุคลากร";
+                        }
 
                         foreach (var detail3 in detail2.budget_personnel_lists_2)
                         {
@@ -2553,30 +2553,35 @@ namespace rmutr_report.Controllers
                                         no3++;
                                     }
 
-                                    // if (cperson == 2)
-                                    // {
-                                    //     detail.budget_personnel_lists[0].topic = "งบบุคลากร";
-                                    //     detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
-                                        // detail.budget_personnel_lists[1].text1 = null;
-                                        // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
-                                        // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
-                                        // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
-                                        //     .row_no = null;
-                                        // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
-                                        //     .text1 = null;
-                                        // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
-                                        //     .details[0].text1 = null;
-                                    //}
+                                     if (cperson == 2)
+                                     {
+                                         detail.budget_personnel_lists[0].topic = "งบบุคลากร";
+                                         detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
+                                         detail.budget_personnel_lists[1].text1 = null;
+                                         detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
+                                         detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
+                                         detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
+                                             .row_no = null;
+                                         detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
+                                             .text1 = null;
+                                         detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
+                                             .details[0].text1 = null;
+                                    }
+                                   
 
-                                    foreach (var detail6 in detail5.details2)
+                                    if (detail5.details2 != null)
                                     {
-                                        if (detail6.topic != null)
+                                        foreach (var detail6 in detail5.details2)
                                         {
-                                            detail6.row_no = no4;
-                                            no4++;
-                                            detail6.text1 = "บาท";
+                                            if (detail6.topic != null)
+                                            {
+                                                detail6.row_no = no4;
+                                                no4++;
+                                                detail6.text1 = "บาท";
+                                            }
                                         }
                                     }
+                                    
                                 }
                             }
                         }
diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll
index 78315f3..b28a899 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 9247eb8..8006be4 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/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
index 0d8f59c..090ae21 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,3 +1,3 @@
 is_global = true
 build_property.RootNamespace = rmutr_report
-build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\
+build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache
index 9f31713..23094ff 100644
Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache and b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache differ
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll
index 78315f3..b28a899 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.genruntimeconfig.cache b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
index ddb6a89..572029b 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
@@ -1 +1 @@
-9100175b74d683f6c7d65447027cdf445467204a
+f530878fb081af78ff5e77410efde9fbbaab91cc
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
index 9247eb8..8006be4 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.restore.info b/obj/rider.project.restore.info
index 555979d..a0c4500 100644
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-16926162047873347
\ No newline at end of file
+16926773444616640
\ No newline at end of file
diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx
index bd62d08..8dac03f 100644
--- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue.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="08/22/2023 10:49:37" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/22/2023 11:08:21" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue" ReferenceName="budget_expenditure_report_from_revenue" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -85,21 +85,21 @@
             <LineObject Name="Line7" Left="689.85" Top="28.35" Width="122.85" Diagonal="true"/>
             <TextObject Name="Text20" Left="689.85" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text17" Left="37.8" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
-            <TextObject Name="Text18" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+            <TextObject Name="Text18" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text19" Left="623.7" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text21" Left="812.7" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <DataBand Name="Data6" Top="318.35" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
               <LineObject Name="Line8" Left="661.5" Top="28.35" Width="122.85" Diagonal="true"/>
               <TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
               <TextObject Name="Text23" Left="85.05" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
-              <TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+              <TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text27" Left="784.35" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <DataBand Name="Data7" Top="353.05" Width="945" Height="28.35" DataSource="budget_rates">
                 <TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text29" Left="122.85" Width="302.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
-                <TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+                <TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text31" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text33" Left="756" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
@@ -110,7 +110,7 @@
                   <TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text35" Left="160.65" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.position_level]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text36" Left="340.2" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.qualification]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-                  <TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+                  <TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text38" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text40" Left="727.65" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <DataBand Name="Data8" Top="422.44" Width="945" Height="28.35" DataSource="details2">