diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 886ea21..d24f5b5 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -149,6 +149,31 @@ namespace BMA.EHR.Report.Service.Controllers var old_ocid = Guid.NewGuid(); dynamic ret; + //for (int i = 0; i <= 20; i++) + //{ + // var s = profile.Salaries[0]; + // old_date = s.SalaryDateAnnounce.Value; + // old_position = s.PositionName; + // old_ocid = s.OcId.Value; + // ret = new + // { + // CitizenId = profile.CitizenId, + // Prefix = profile.Prefix, + // FirstName = profile.FirstName, + // LastName = profile.LastName, + // DateOfBirth = profile.DateOfBirth, + // DateRetire = profile.DateRetire, + // RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง {profile.RegistrationSubDistrict}\r\nเขต/อำเภอ {profile.RegistrationDistrict}\r\nจังหวัด {profile.RegistrationProvince} รหัสไปรษณีย์ {profile.RegistrationZipCode}", + // SalaryAmount = profile.SalaryAmount, + // Education = profile.Education, + // AppointText = c == 1 ? "(เริ่มรับราชการ)" : "", + // SalaryDate = s.SalaryDateAnnounce.Value.ToThaiShortDate(), + // PositionName = s.PositionName, + // OCFullPath = _profileService.GetOrganizationNameFullPath(s.OcId.Value, false, false) + // }; + // data.Add(ret); + //} + foreach (var s in profile.Salaries) { //if((old_date.Date != s.SalaryDateAnnounce.Value.Date)) diff --git a/Report/Profile/rptShortKp7.trdp b/Report/Profile/rptShortKp7.trdp index 1c3b227..ca7f2d4 100644 Binary files a/Report/Profile/rptShortKp7.trdp and b/Report/Profile/rptShortKp7.trdp differ