แก้ไขแสดงรายชื่อรายงานประกาศเกษียณ

BMA.EHR.Report.Service/Controllers/RetireReportController.cs

@@ -42,14 +42,10 @@ namespace BMA.EHR.Report.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetProfileRetirement([FromRoute] Guid Id, string exportType = "pdf")
         {
             var retire = await _service.GetProfileRetirementdAsync(Id);
-            if (retire == null)
+            if (retire != null)
             {
-                return NotFound();
-            }
-            else
-            {
-                var reportfile = "";
-                var returnfile = "";
+                var reportfile = string.Empty;
+                var returnfile = string.Empty;
                 exportType = exportType.Trim();
                 switch (retire.GetType().GetProperty("Type").GetValue(retire))
                 {
@@ -89,9 +85,10 @@ namespace BMA.EHR.Report.Service.Controllers
                 {
                     report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
                 }
-                //Add Parameter
-                report.ReportParameters["Year"].Value = retire.GetType().GetProperty("Year").GetValue(retire);
-                report.ReportParameters["Total"].Value = retire.GetType().GetProperty("Total").GetValue(retire);
+                report.DataSource = retire;
+                ////Add Parameter
+                //report.ReportParameters["Year"].Value = retire.GetType().GetProperty("Year").GetValue(retire);
+                //report.ReportParameters["Total"].Value = retire.GetType().GetProperty("Total").GetValue(retire);
 
                 var _profileList = new List<dynamic>();
 
@@ -123,6 +120,10 @@ namespace BMA.EHR.Report.Service.Controllers
                 var content = result.DocumentBytes;
                 return File(content, $"application/{exportType}", returnfile);
             }
+            else
+            {
+                return NotFound();
+            }
         }
         #endregion
     }

BMA.EHR.Report.Service/appsettings.json

@@ -26,10 +26,10 @@
         }
     },
     "MinIO": {
-        "Endpoint": "https://s3.frappet.com/",
+        "Endpoint": "https://s3cluster.frappet.com/",
         "AccessKey": "frappet",
-        "SecretKey": "P@ssw0rd",
-        "BucketName": "bma-recruit"
+        "SecretKey": "FPTadmin2357",
+        "BucketName": "bma-ehr-fpt"
     },
     "Protocol": "HTTPS",
     "telerikReporting": {