diff --git a/Controllers/KPI.Controller.cs b/Controllers/KPI.Controller.cs
index 9a64baf..d79c2b8 100644
--- a/Controllers/KPI.Controller.cs
+++ b/Controllers/KPI.Controller.cs
@@ -35,7 +35,7 @@ namespace rmutr_report.Controllers
 
         [HttpPost, Route("reports/kpi/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
-        public IActionResult GetKpiReport([FromRoute] string type, [FromBody] List<kpi> _kpi)
+        public IActionResult GetKpiReport([FromRoute] string type, [FromBody] kpi _kpi)
         {
             var workbook = new XLWorkbook();
             var ws = workbook.Worksheets.Add("kpi");
@@ -119,13 +119,13 @@ namespace rmutr_report.Controllers
             int row = 3;
             int no = 1;
             int rowno = 1;
-            foreach (var kpis in _kpi)
-            {
+            // foreach (var kpis in _kpi)
+            // {
                 if (_kpi != null)
                 {
-                    ws.Range("D1:E1").Merge().Value = "ค่าเป้าหมาย ปี " + kpis.academic_year.Substring(2, 2);
+                    ws.Range("D1:E1").Merge().Value = "ค่าเป้าหมาย ปี " + _kpi.academic_year.Substring(2, 2);
                     ws.Range("D1:E1").Style.Font.Bold = true;
-                    foreach (var header in kpis.header_data)
+                    foreach (var header in _kpi.header_data)
                     {
                         string kpiname = "ประเด็นยุทธ์ศาสตร์ที่ " + no + " :";
                         no++;
@@ -163,14 +163,11 @@ namespace rmutr_report.Controllers
                             XLBorderStyleValues.Thin;
                         ws.Cell(row, 1).Style.Font.Bold = true;
                         row++;
-                    }
-
-                    
-                    var data = kpis.header_data.Select(d => d.data).ToList();
-                    foreach (var detail in data)
-                    {
+                          //var data = _kpi.header_data.Select(d => d.data).ToList();
+                    // foreach (var detail in header)
+                    // {
                         
-                        foreach (var data1 in detail)
+                        foreach (var data1 in header.data)
                         {
                             ws.Cell(row, 2).Value = rowno;
                             ws.Cell(row, 3).Value = data1.name;
@@ -216,8 +213,12 @@ namespace rmutr_report.Controllers
                         }
                         //row++;
                     }
-                }
-            }
+                    }
+
+                    
+                  
+                //}
+           // }
 
             using (var stream = new MemoryStream())
             {
diff --git a/Controllers/Summary.Controller.cs b/Controllers/Summary.Controller.cs
index d377c40..d0a9ee4 100644
--- a/Controllers/Summary.Controller.cs
+++ b/Controllers/Summary.Controller.cs
@@ -73,7 +73,7 @@ namespace rmutr_report.Controllers
         [HttpPost, Route("reports/summary_of_equipment_five_year/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetEquipmentReport([FromRoute] string type,
-            [FromBody] List<summary_of_equipment_five_year> summary_of_equipments)
+            [FromBody] summary_of_equipment_five_year summary_of_equipments)
         {
             var workbook = new XLWorkbook();
             var ws = workbook.Worksheets.Add("รายการครุภัณฑ์");
@@ -204,54 +204,54 @@ namespace rmutr_report.Controllers
             int row = 5;
             int no = 1;
         
-            foreach (var equipments in summary_of_equipments)
-            {
+            // foreach (var equipments in summary_of_equipments)
+            // {
                 if (summary_of_equipments != null)
                 {
-                    ws.Range("C2:H2").Merge().Value = "ปี " + equipments.academic_year;
+                    ws.Range("C2:H2").Merge().Value = "ปี " + summary_of_equipments.academic_year;
                     ws.Cell("C2").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("C2").Style.Font.FontSize = 14;
                     ws.Range("C2:H2").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Range("C2:H2").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Range("C2:H2").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                    ws.Cell("I4").Value = equipments.budget_year_1;
+                    ws.Cell("I4").Value = summary_of_equipments.budget_year_1;
                     ws.Cell("I4").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("I4").Style.Font.FontSize = 12;
                     ws.Cell("I4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Cell("I4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Cell("I4").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                    ws.Cell("J4").Value = equipments.budget_year_2;
+                    ws.Cell("J4").Value = summary_of_equipments.budget_year_2;
                     ws.Cell("J4").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("J4").Style.Font.FontSize = 12;
                     ws.Cell("J4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Cell("J4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Cell("J4").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                    ws.Cell("K4").Value = equipments.budget_year_3;
+                    ws.Cell("K4").Value = summary_of_equipments.budget_year_3;
                     ws.Cell("K4").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("K4").Style.Font.FontSize = 12;
                     ws.Cell("K4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Cell("K4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Cell("K4").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                    ws.Cell("L4").Value = equipments.budget_year_4;
+                    ws.Cell("L4").Value = summary_of_equipments.budget_year_4;
                     ws.Cell("L4").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("L4").Style.Font.FontSize = 12;
                     ws.Cell("L4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Cell("L4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Cell("L4").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                    ws.Cell("M4").Value = equipments.budget_year_5;
+                    ws.Cell("M4").Value = summary_of_equipments.budget_year_5;
                     ws.Cell("M4").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("M4").Style.Font.FontSize = 12;
                     ws.Cell("M4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Cell("M4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Cell("M4").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                    ws.Range("N2:O3").Merge().Value = "ใบเสนอราคาครุภัณฑ์ ปี " + equipments.academic_year;
+                    ws.Range("N2:O3").Merge().Value = "ใบเสนอราคาครุภัณฑ์ ปี " + summary_of_equipments.academic_year;
                     ws.Cell("N2").Style.Font.FontName = "TH Sarabun New";
                     ws.Cell("N2").Style.Font.FontSize = 14;
                     ws.Range("N2:O3").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                     ws.Range("N2:O3").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                     ws.Range("N2:O3").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
                     ws.Cell("N2").Style.Alignment.WrapText = true;
-                    foreach (var equipment in equipments.data)
+                    foreach (var equipment in summary_of_equipments.data)
                     {
                         ws.Cell(row, 1).Value = no;
                         no++;
@@ -311,7 +311,7 @@ namespace rmutr_report.Controllers
                         row++;
                     }
                 }
-            }
+            //}
         
             using (var stream = new MemoryStream())
             {
@@ -412,7 +412,7 @@ namespace rmutr_report.Controllers
         [HttpPost, Route("reports/summary_building_construction/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetSum2Report([FromRoute] string type,
-            [FromBody] List<summary_building_construction> summary_building_constructions)
+            [FromBody] summary_building_construction summary_building_constructions)
         {
             {
                 var workbook = new XLWorkbook();
@@ -582,13 +582,13 @@ namespace rmutr_report.Controllers
                 int row = 7;
                 int no = 1;
                
-                foreach (var build in summary_building_constructions)
-                {
+                // foreach (var build in summary_building_constructions)
+                // {
                     if (summary_building_constructions != null)
                     {
                         //string first = "สรุปแผนความต้องการ รายการก่อสร้างอาคารหรือสิ่งก่อสร้างและปรับปรุงซ่อมแซมต่อเติม ของมหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์";
-                        string second = "ปีงบประมาณ " + build.academic_year_name_th + " " + build.header_name;
-                        string third = "หน่วยงาน/คณะ " + build.agency_name_th + " พื้นที่ " + build.location;
+                        string second = "ปีงบประมาณ " + summary_building_constructions.academic_year_name_th + " " + summary_building_constructions.header_name;
+                        string third = "หน่วยงาน/คณะ " + summary_building_constructions.agency_name_th + " พื้นที่ " + summary_building_constructions.location;
                         ws.Range("A1:S1").Merge().Value = "สรุปแผนความต้องการ รายการก่อสร้างอาคารหรือสิ่งก่อสร้างและปรับปรุงซ่อมแซมต่อเติม ของมหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์";
                         ws.Range("A1:S1").Merge().Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                         ws.Range("A1:S1").Merge().Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
@@ -601,35 +601,35 @@ namespace rmutr_report.Controllers
                         ws.Range("A1:A3").Style.Font.Bold = true;
                         ws.Range("A1:A3").Style.Font.FontSize = 16;
                         ws.Range("A1:A3").Style.Font.FontName = "TH Sarabun New";
-                        ws.Cell("L5").Value = build.budget_year_1;
+                        ws.Cell("L5").Value = summary_building_constructions.budget_year_1;
                         ws.Cell("L5").Style.Alignment.WrapText = true;
                         ws.Cell("L5").Style.Font.FontName = "TH Sarabun New";
                         ws.Cell("L5").Style.Font.FontSize = 10;
                         ws.Cell("L5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                         ws.Cell("L5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                         ws.Cell("L5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                        ws.Cell("M5").Value = build.budget_year_2;
+                        ws.Cell("M5").Value = summary_building_constructions.budget_year_2;
                         ws.Cell("M5").Style.Alignment.WrapText = true;
                         ws.Cell("M5").Style.Font.FontName = "TH Sarabun New";
                         ws.Cell("M5").Style.Font.FontSize = 10;
                         ws.Cell("M5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                         ws.Cell("M5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                         ws.Cell("M5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                        ws.Cell("N5").Value = build.budget_year_3;
+                        ws.Cell("N5").Value = summary_building_constructions.budget_year_3;
                         ws.Cell("N5").Style.Alignment.WrapText = true;
                         ws.Cell("N5").Style.Font.FontName = "TH Sarabun New";
                         ws.Cell("N5").Style.Font.FontSize = 10;
                         ws.Cell("N5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                         ws.Cell("N5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                         ws.Cell("N5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                        ws.Cell("O5").Value = build.budget_year_4;
+                        ws.Cell("O5").Value = summary_building_constructions.budget_year_4;
                         ws.Cell("O5").Style.Alignment.WrapText = true;
                         ws.Cell("O5").Style.Font.FontName = "TH Sarabun New";
                         ws.Cell("O5").Style.Font.FontSize = 10;
                         ws.Cell("O5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
                         ws.Cell("O5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                         ws.Cell("O5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
-                        ws.Cell("P5").Value = build.budget_year_5;
+                        ws.Cell("P5").Value = summary_building_constructions.budget_year_5;
                         ws.Cell("P5").Style.Alignment.WrapText = true;
                         ws.Cell("P5").Style.Font.FontName = "TH Sarabun New";
                         ws.Cell("P5").Style.Font.FontSize = 10;
@@ -637,7 +637,7 @@ namespace rmutr_report.Controllers
                         ws.Cell("P5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
                         ws.Cell("P5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
                         ws.Range("L5:P5").Style.Fill.BackgroundColor = XLColor.MistyRose;
-                        ws.Range("Q4:R4").Merge().Value = "ความพร้อมสิ่งก่อสร้าง ปี "+build.academic_year;
+                        ws.Range("Q4:R4").Merge().Value = "ความพร้อมสิ่งก่อสร้าง ปี "+summary_building_constructions.academic_year;
                         ws.Range("Q4:R4").Style.Fill.BackgroundColor = XLColor.MistyRose;
                         ws.Cell("Q4").Style.Font.FontName = "TH Sarabun New";
                         ws.Cell("Q4").Style.Font.FontSize = 14;
@@ -647,7 +647,7 @@ namespace rmutr_report.Controllers
                         ws.Range("L6:R6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
                         ws.Range("D6:F6").Style.Fill.BackgroundColor = XLColor.Gainsboro;
                         ws.Range("H6:S6").Style.Fill.BackgroundColor = XLColor.Gainsboro;
-                        foreach (var building in build.data)
+                        foreach (var building in summary_building_constructions.data)
                         {
                             ws.Cell(row, 1).Value = no;
                             no++;
@@ -716,7 +716,7 @@ namespace rmutr_report.Controllers
                             row++;
                         }
                     }
-                }
+                //}
 
                 using (var stream = new MemoryStream())
                 {