diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 030e2bc..49a3b81 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -88,8 +88,8 @@ namespace BMA.EHR.Report.Service.Controllers ps.PositionSalaryAmount }).ToList(); - var profile = (from p in _context.Profiles.ToList() - join pf in _context.Prefixes.ToList() on p.PrefixId equals pf.Id + var profile = (from p in _context.Profiles + join pf in _context.Prefixes on p.PrefixId equals pf.Id where p.Id == id select new @@ -493,7 +493,7 @@ namespace BMA.EHR.Report.Service.Controllers OcFullPath = profile2.OcFullPath }).ToList(); - while (salary.Count < 1) + while (salary.Count < 30) { salary.Add(new { @@ -519,7 +519,10 @@ namespace BMA.EHR.Report.Service.Controllers { report2 = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream); } - report2.DataSource = salary; + + report2.ReportParameters["FullName"].Value = profile2.FullName; + report2.ReportParameters["OcFullPath"].Value = profile2.OcFullPath; + // binding to table var tblSalary = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["tblSalary"]; tblSalary.DataSource = salary; diff --git a/Report/Profile/rptKK1_Page2.trdp b/Report/Profile/rptKK1_Page2.trdp index c27bee0..fb1a1e4 100644 Binary files a/Report/Profile/rptKK1_Page2.trdp and b/Report/Profile/rptKK1_Page2.trdp differ