hrms-bangkok/hrms-api-report-v1
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้รายงานประวัติอย่างย่อ

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-06-30 14:21:27 +07:00
parent 6350c78126
commit d3059d8f1d
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Controllers/ProfileReportController.cs
View file

@ -105,6 +105,7 @@ namespace BMA.EHR.Report.Service.Controllers
p.FirstName,
p.LastName,
DateOfBirth = p.BirthDate.ToThaiShortDate(),
DateRetire = p.BirthDate.CalculateRetireDate().ToThaiShortDate(),
RegistrationAddress = p.RegistrationAddress,
RegistrationProvince = _context.Provinces.AsQueryable().FirstOrDefault(x => x.Id == p.RegistrationProvinceId)?.Name,
RegistrationDistrict = _context.Districts.AsQueryable().FirstOrDefault(x => x.Id == p.RegistrationDistrictId)?.Name,
@ -132,6 +133,7 @@ namespace BMA.EHR.Report.Service.Controllers
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,
@ -184,6 +186,7 @@ namespace BMA.EHR.Report.Service.Controllers
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,
@ -206,6 +209,7 @@ namespace BMA.EHR.Report.Service.Controllers
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,

BIN
Report/Profile/rptShortKp7.trdp
View file

Binary file not shown.

2
appsettings.Development.json
View file

@ -15,7 +15,7 @@
"ConnectionStrings": {
"MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017",
"RecruitConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"EHRConnection": "server=192.168.1.9;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"EHRConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {