diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx
index a915be9..40117a1 100644
--- a/wwwroot/reports/building_fours.frx
+++ b/wwwroot/reports/building_fours.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/02/2023 21:57:02" ReportInfo.Modified="04/03/2023 20:11:28" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/02/2023 21:57:02" ReportInfo.Modified="04/04/2023 16:24:34" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="building_four" ReferenceName="building_four" DataType="System.Int32" Enabled="true">
       <Column Name="agency_faculty" DataType="System.String"/>
@@ -395,7 +395,7 @@
       </BusinessObjectDataSource>
     </BusinessObjectDataSource>
   </Dictionary>
-  <ReportPage Name="Page1" PaperHeight="350" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="รายละเอียดหลัก" PaperHeight="350" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data1" Width="718.2" Height="274.05">
       <TextObject Name="Text40" Width="718.2" Height="28.35" Text="ข้อกำหนด : รายการที่ดินและสิ่งก่อสร้างทุกรายการที่เสนอขอต้องแนบแบบรูปรายการ" HorzAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold, Underline"/>
       <TextObject Name="Text41" Top="75.6" Width="122.85" Height="28.35" Text="หน่วยงาน / คณะ" Font="TH SarabunPSK, 16pt, style=Bold"/>
@@ -649,7 +649,7 @@
       </DataBand>
     </DataBand>
   </ReportPage>
-  <ReportPage Name="Page2" RawPaperSize="9" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="แผนการใช้จ่ายงบประมาณ" RawPaperSize="9" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data22" Width="718.2" Height="122.85">
       <TextObject Name="Text2" Width="718.2" Height="28.35" Text="12. แผนการใช้จ่ายงบประมาณ [building_four.budget_spending_plan_year]" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TableObject Name="Table27" Top="66.15" Width="718.2" Height="56.7">
@@ -870,8 +870,8 @@
             <TableCell Name="Cell221" Border.Lines="All" Text="[building_four.material_construction_labor2.note]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
           </TableRow>
         </TableObject>
-        <DataFooterBand Name="DataFooter3" Top="415.34" Width="718.2" Height="94.5">
-          <TableObject Name="Table36" Width="718.2" Height="47.25">
+        <DataFooterBand Name="DataFooter3" Top="415.34" Width="718.2" Height="236.25">
+          <TableObject Name="Table36" Top="189" Width="718.2" Height="47.25">
             <TableColumn Name="Column164" Width="47.25"/>
             <TableColumn Name="Column165" Width="255.15"/>
             <TableColumn Name="Column166" Width="103.95"/>
@@ -887,11 +887,58 @@
               <TableCell Name="Cell227" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
             </TableRow>
           </TableObject>
-          <TextObject Name="Text143" Top="66.15" Width="718.2" Height="28.35" Text=" ขนาดหรือเนื้อที่อาคาร   จำนวน  [building_four.square_meter] ตรม.         เฉลี่ย [building_four.square_meter_amount] บาท/ตร.ม." HorzAlign="Center" Font="TH SarabunPSK, 14pt"/>
+          <TableObject Name="Table74" Width="718.2" Height="189">
+            <TableColumn Name="Column425" Width="47.25"/>
+            <TableColumn Name="Column426" Width="255.15"/>
+            <TableColumn Name="Column427" Width="103.95"/>
+            <TableColumn Name="Column428" Width="85.05"/>
+            <TableColumn Name="Column429" Width="103.95"/>
+            <TableColumn Name="Column430" Width="122.85"/>
+            <TableRow Name="Row76" Height="37.8">
+              <TableCell Name="Cell433" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
+              <TableCell Name="Cell434" Border.Lines="All" Text="เงื่อนไขการใช้ตาราง Factor F" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+              <TableCell Name="Cell435" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
+              <TableCell Name="Cell436" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
+              <TableCell Name="Cell437" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
+              <TableCell Name="Cell438" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
+            </TableRow>
+            <TableRow Name="Row77" Height="37.8">
+              <TableCell Name="Cell439" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell440" Border.Lines="All" Text="เงินล่วงหน้า                       0      %" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+              <TableCell Name="Cell441" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell442" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell443" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell444" Border.Lines="All" Font="Arial, 10pt"/>
+            </TableRow>
+            <TableRow Name="Row78" Height="37.8">
+              <TableCell Name="Cell445" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell446" Border.Lines="All" Text="เงินหลักประกันผลงานหัก        5      %" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+              <TableCell Name="Cell447" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell448" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell449" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell450" Border.Lines="All" Font="Arial, 10pt"/>
+            </TableRow>
+            <TableRow Name="Row79" Height="37.8">
+              <TableCell Name="Cell451" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell452" Border.Lines="All" Text="ดอกเบี้ยเงินกู้                      6      %" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+              <TableCell Name="Cell453" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell454" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell455" Border.Lines="All" Font="Arial, 10pt"/>
+              <TableCell Name="Cell456" Border.Lines="All" Font="Arial, 10pt"/>
+            </TableRow>
+            <TableRow Name="Row80" Height="37.8">
+              <TableCell Name="Cell457" Border.Lines="Left, Right, Bottom" Font="Arial, 10pt"/>
+              <TableCell Name="Cell458" Border.Lines="Left, Right, Bottom" Text="ภาษีมูลค่าเพิ่ม                    7     %" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+              <TableCell Name="Cell459" Border.Lines="Left, Right, Bottom" Font="Arial, 10pt"/>
+              <TableCell Name="Cell460" Border.Lines="Left, Right, Bottom" Font="Arial, 10pt"/>
+              <TableCell Name="Cell461" Border.Lines="Left, Right, Bottom" Font="Arial, 10pt"/>
+              <TableCell Name="Cell462" Border.Lines="Left, Right, Bottom" Font="Arial, 10pt"/>
+            </TableRow>
+          </TableObject>
         </DataFooterBand>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary11" Top="514.33" Width="718.2" Height="453.6">
+    <ReportSummaryBand Name="ReportSummary11" Top="656.08" Width="718.2" Height="453.6">
       <TextObject Name="Text132" Top="425.25" Width="718.2" Height="28.35" Text="              โครงการ/งานก่อสร้างที่คำนวณราคากลาง" Font="TH SarabunPSK, 14pt"/>
       <TextObject Name="Text131" Top="396.9" Width="718.2" Height="28.35" Text="หมายเหตุ  แบบฟอร์มนี้  สามารถปรับปรุงและเปลี่ยนแปลงได้ตามความเหมาะสมและสอดคล้องกับ" Font="TH SarabunPSK, 14pt"/>
       <LineObject Name="Line4" Left="18.9" Top="292.95" Width="245.7" Border.Style="Dot" Diagonal="true"/>
@@ -909,6 +956,7 @@
       <TextObject Name="Text134" Left="481.95" Top="113.4" Width="18.9" Height="18.9" Text=")" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
       <TextObject Name="Text135" Top="132.3" Width="718.2" Height="28.35" Text="ประธานกรรมการกำหนดราคากลาง" HorzAlign="Center" Font="TH SarabunPSK, 14pt"/>
       <LineObject Name="Line1" Left="236.25" Top="94.5" Width="245.7" Border.Style="Dot" Diagonal="true"/>
+      <TextObject Name="Text143" Width="718.2" Height="28.35" Text=" ขนาดหรือเนื้อที่อาคาร   จำนวน  [building_four.square_meter] ตรม.         เฉลี่ย [building_four.square_meter_amount] บาท/ตร.ม." HorzAlign="Center" Font="TH SarabunPSK, 14pt"/>
     </ReportSummaryBand>
   </ReportPage>
   <ReportPage Name="ปร5ข" PaperHeight="380" Watermark.Font="Arial, 60pt">
@@ -1319,7 +1367,7 @@
         </TableRow>
       </TableObject>
       <TextObject Name="Text31" Left="652.05" Top="56.7" Width="255.15" Height="28.35" Text="[building_four.model_number_7]" HorzAlign="Right" Font="TH SarabunPSK, 14pt"/>
-      <DataBand Name="Data38" Top="278.17" Width="907.2" Height="37.8" DataSource="architectural_category">
+      <DataBand Name="Data38" Top="278.54" Width="907.2" Height="37.8" DataSource="architectural_category">
         <TableObject Name="Table33" Width="907.2" Height="37.8">
           <TableColumn Name="Column213" Width="47.25"/>
           <TableColumn Name="Column214" Width="141.75"/>
@@ -1346,7 +1394,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary3" Top="320.1" Width="907.2" Height="37.8">
+    <ReportSummaryBand Name="ReportSummary3" Top="320.84" Width="907.2" Height="37.8">
       <TableObject Name="Table34" Width="907.2" Height="37.8">
         <TableColumn Name="Column223" Width="47.25"/>
         <TableColumn Name="Column224" Width="141.75"/>
@@ -1419,7 +1467,7 @@
         </TableRow>
       </TableObject>
       <TextObject Name="Text39" Left="652.05" Top="56.7" Width="255.15" Height="28.35" Text="[building_four.model_number_8]" HorzAlign="Right" Font="TH SarabunPSK, 14pt"/>
-      <DataBand Name="Data40" Top="278.17" Width="907.2" Height="37.8" DataSource="bathroom_category">
+      <DataBand Name="Data40" Top="278.54" Width="907.2" Height="37.8" DataSource="bathroom_category">
         <TableObject Name="Table47" Width="907.2" Height="37.8">
           <TableColumn Name="Column245" Width="47.25"/>
           <TableColumn Name="Column246" Width="141.75"/>
@@ -1446,7 +1494,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary4" Top="320.1" Width="907.2" Height="37.8">
+    <ReportSummaryBand Name="ReportSummary4" Top="320.84" Width="907.2" Height="37.8">
       <TableObject Name="Table48" Width="907.2" Height="37.8">
         <TableColumn Name="Column255" Width="47.25"/>
         <TableColumn Name="Column256" Width="141.75"/>
@@ -1919,7 +1967,7 @@
         </TableRow>
       </TableObject>
       <TextObject Name="Text171" Left="652.05" Top="56.7" Width="255.15" Height="28.35" Text="[building_four.model_number_13]" HorzAlign="Right" Font="TH SarabunPSK, 14pt"/>
-      <DataBand Name="Data50" Top="278.17" Width="907.2" Height="37.8" DataSource="extra_cost_category">
+      <DataBand Name="Data50" Top="278.54" Width="907.2" Height="37.8" DataSource="extra_cost_category">
         <TableObject Name="Table72" Width="907.2" Height="37.8">
           <TableColumn Name="Column405" Width="47.25"/>
           <TableColumn Name="Column406" Width="141.75"/>
@@ -1946,7 +1994,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary9" Top="320.1" Width="907.2" Height="37.8">
+    <ReportSummaryBand Name="ReportSummary9" Top="320.84" Width="907.2" Height="37.8">
       <TableObject Name="Table73" Width="907.2" Height="37.8">
         <TableColumn Name="Column415" Width="47.25"/>
         <TableColumn Name="Column416" Width="141.75"/>
@@ -1973,17 +2021,17 @@
       </TableObject>
     </ReportSummaryBand>
   </ReportPage>
-  <ReportPage Name="Page4" RawPaperSize="9" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="รายละเอียดการแบ่งงวดงาน" RawPaperSize="9" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data26" Width="718.2" Height="113.4">
       <TextObject Name="Text3" Width="718.2" Height="28.35" Text="14.  รายละเอียดการแบ่งงวดงานรายการก่อสร้างผูกพัน" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text108" Left="151.2" Top="28.35" Width="548.1" Height="28.35" Text="วงเงินเต็มรูป [building_four.full_limit] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text109" Left="151.2" Top="56.7" Width="548.1" Height="28.35" Text="เงินงบประมาณแผ่นดิน [building_four.national_budget] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text110" Left="151.2" Top="85.05" Width="548.1" Height="28.35" Text="เงินงบประมาณรายได้ [building_four.income_budget] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" Font="TH SarabunPSK, 16pt"/>
-      <DataBand Name="Data27" Top="117.52" Width="718.2" Height="28.35" DataSource="detail_division_work">
+      <DataBand Name="Data27" Top="117.89" Width="718.2" Height="28.35" DataSource="detail_division_work">
         <TextObject Name="Text111" Left="151.2" Width="567" Height="28.35" Text="ปีงบประมาณ [building_four.detail_division_work.budget_year] เป็นเงิน [building_four.detail_division_work.amount] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data28" Top="150" Width="718.2" Height="47.25">
+    <DataBand Name="Data28" Top="150.74" Width="718.2" Height="47.25">
       <TableObject Name="Table5" Width="718.2" Height="47.25">
         <TableColumn Name="Column12" Width="47.25"/>
         <TableColumn Name="Column13" Width="85.05"/>
@@ -2000,7 +2048,7 @@
           <TableCell Name="Cell17" Border.Lines="All" Text="จ่ายสะสม" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data29" Top="201.37" Width="718.2" Height="28.35" DataSource="detail_division_work_table">
+      <DataBand Name="Data29" Top="202.48" Width="718.2" Height="28.35" DataSource="detail_division_work_table">
         <TableObject Name="Table9" Width="718.2" Height="28.35">
           <TableColumn Name="Column34" Width="47.25"/>
           <TableColumn Name="Column35" Width="85.05"/>
@@ -2019,7 +2067,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data30" Top="233.84" Width="718.2" Height="453.6">
+    <DataBand Name="Data30" Top="235.33" Width="718.2" Height="453.6">
       <TextObject Name="Text112" Top="9.45" Width="718.2" Height="28.35" Text="15.  หากได้รับการจัดสรรงบประมาณอาคารใหม่จะทำให้มหาวิทยาลัย (จะส่งผลอะไรบ้าง)" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text113" Top="37.8" Width="718.2" Height="28.35" Text="[building_four.result]" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text114" Top="75.6" Width="718.2" Height="28.35" Text="16. หากไม่ได้รับการจัดสรรงบประมาณอาคารใหม่จะทำให้มหาวิทยาลัย (จะส่งผลเสียหายหรือผลกระทบอย่างไร)" Font="TH SarabunPSK, 16pt, style=Bold"/>