diff --git a/BMA.EHR.Infrastructure/Storage/MinIOService.cs b/BMA.EHR.Infrastructure/Storage/MinIOService.cs index 521efc91..d31a8aec 100644 --- a/BMA.EHR.Infrastructure/Storage/MinIOService.cs +++ b/BMA.EHR.Infrastructure/Storage/MinIOService.cs @@ -238,5 +238,19 @@ namespace BMA.EHR.Application.Repositories throw; } } + + public async Task CheckBmaOfficer(string CitizenId) + { + var data = await _context.Profiles.FirstOrDefaultAsync(x => x.CitizenId == CitizenId); + if (data == null) + return null; + if (data.ProfileType.Trim().ToUpper() == "OFFICER") + return "officer"; + if (data.EmployeeClass.Trim().ToUpper() == "PERM") + return "employee_perm"; + if (data.EmployeeClass.Trim().ToUpper() == "TEMP") + return "employee_temp"; + return "employee"; + } } } \ No newline at end of file diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index c08dda23..72506862 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -112,9 +112,32 @@ namespace BMA.EHR.Placement.Service.Controllers ReportingDate = x.ReportingDate, BmaOfficer = x.IsOfficer, StatusId = x.PlacementStatus, + Number = x.Number, Disclaim = x.IsRelief, }).ToListAsync(); - return Success(data); + + var result = new List(); + foreach (var p in data) + { + var _data = new + { + p.PersonalId, + p.FullName, + p.IdCard, + p.ProfilePhoto, + p.OrganizationName, + p.OrganizationShortName, + p.PositionNumber, + p.PositionPath, + p.ReportingDate, + BmaOfficer = await _documentService.CheckBmaOfficer(p.IdCard), + p.StatusId, + p.Number, + p.Disclaim, + }; + result.Add(_data); + } + return Success(result); } else { @@ -141,9 +164,32 @@ namespace BMA.EHR.Placement.Service.Controllers ReportingDate = x.ReportingDate, BmaOfficer = x.IsOfficer, StatusId = x.PlacementStatus, + Number = x.Number, Disclaim = x.IsRelief, }).ToListAsync(); - return Success(data); + + var result = new List(); + foreach (var p in data) + { + var _data = new + { + p.PersonalId, + p.FullName, + p.IdCard, + p.ProfilePhoto, + p.OrganizationName, + p.OrganizationShortName, + p.PositionNumber, + p.PositionPath, + p.ReportingDate, + BmaOfficer = await _documentService.CheckBmaOfficer(p.IdCard), + p.StatusId, + p.Number, + p.Disclaim, + }; + result.Add(_data); + } + return Success(result); } }