From a9eabbab2e4a573808119f09e62b74a8a4c31bfc Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 1 Jul 2024 16:52:46 +0700 Subject: [PATCH] fix retire/retire report --- .../Repositories/Reports/RetireReportRepository.cs | 4 ++-- .../Controllers/RetirementController.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs index 382627eb..2c5485a9 100644 --- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -120,7 +120,7 @@ namespace BMA.EHR.Application.Repositories.Reports { profiles = profiles.OrderBy(x => x.order).ToList(); } - string SignDate = DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(); + string SignDate = retireHistorys.SignDate != null ? DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-"; return new { SignDate, retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles }; } } @@ -194,7 +194,7 @@ namespace BMA.EHR.Application.Repositories.Reports // }; // retires.Add(data); // } - string SignDate = DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(); + string SignDate = retire.SignDate != null ? DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-"; return new { SignDate, retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index f48558f5..d628b3d2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -958,7 +958,7 @@ namespace BMA.EHR.Retirement.Service.Controllers } else { - var apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{req.ProfileId}"; + var apiUrl = $"{_configuration["API"]}org/profile-employee/profileid/position/{req.ProfileId}"; using (var client = new HttpClient()) { var data = new RetirementProfile @@ -1012,8 +1012,8 @@ namespace BMA.EHR.Retirement.Service.Controllers data.posLevelId = org.result.posLevelId; data.posLevelName = org.result.posLevelName; data.posLevelRank = org.result.posLevelRank; - data.posExecutiveId = org.result.posExecutiveId; - data.posExecutiveName = org.result.posExecutiveName; + //data.posExecutiveId = org.result.posExecutiveId; + //data.posExecutiveName = org.result.posExecutiveName; data.posNo = org.result.posNo; _context.RetirementProfiles.Add(data);