diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 4570c78..915a7fa 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -131,7 +131,7 @@ namespace BMA.EHR.Report.Service.Controllers FirstName = profile.FirstName, LastName = profile.LastName, DateOfBirth = profile.DateOfBirth, - RegistrationAddress = $"{profile.RegistrationAddress} ตำบล/แขวง{profile.RegistrationSubDistrict} เขต/อำเภอ{profile.RegistrationDistrict} จังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", + RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง{profile.RegistrationSubDistrict}\r\nเขต/อำเภอ{profile.RegistrationDistrict}\r\nจังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", SalaryAmount = profile.SalaryAmount, Education = profile.Education, AppointText = "", @@ -183,7 +183,7 @@ namespace BMA.EHR.Report.Service.Controllers FirstName = profile.FirstName, LastName = profile.LastName, DateOfBirth = profile.DateOfBirth, - RegistrationAddress = $"{profile.RegistrationAddress} ตำบล/แขวง{profile.RegistrationSubDistrict} เขต/อำเภอ{profile.RegistrationDistrict} จังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", + 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 ? "(เริ่มรับราชการ)" : "", @@ -205,7 +205,7 @@ namespace BMA.EHR.Report.Service.Controllers FirstName = profile.FirstName, LastName = profile.LastName, DateOfBirth = profile.DateOfBirth, - RegistrationAddress = $"{profile.RegistrationAddress} ตำบล/แขวง{profile.RegistrationSubDistrict} เขต/อำเภอ{profile.RegistrationDistrict} จังหวัด{profile.RegistrationProvince} รหัสไปรษณีย์{profile.RegistrationZipCode}", + 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 ? "(เริ่มรับราชการ)" : "", diff --git a/Report/Profile/rptShortKp7.trdp b/Report/Profile/rptShortKp7.trdp index 15108b7..0376daa 100644 Binary files a/Report/Profile/rptShortKp7.trdp and b/Report/Profile/rptShortKp7.trdp differ