diff --git a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs index 8018877c..ae18d6a0 100644 --- a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs +++ b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs @@ -1,4 +1,4 @@ -using BMA.EHR.Application.Common.Interfaces; +using BMA.EHR.Application.Common.Interfaces; using BMA.EHR.Application.Requests; using BMA.EHR.Domain.Models.HR; using BMA.EHR.Domain.Models.Insignias; @@ -238,7 +238,6 @@ namespace BMA.EHR.Application.Repositories p.IsActive == true && p.IsLeave == false && p.DateAppoint != null && - p.ProfileType == "employee" && p.EmployeeClass == "perm" ) @@ -5359,6 +5358,7 @@ namespace BMA.EHR.Application.Repositories { var result_candidate = new List(); + var type_coin = await GetCoinCandidate(periodId, ocId); var employee_type1 = await GetEmployeeInsignia_Type1(periodId, ocId); var employee_type2 = await GetEmployeeInsignia_Type2(periodId, ocId); var type1_level1 = await GetInsigniaCandidate_Type1_Level1(periodId, ocId); @@ -5375,9 +5375,15 @@ namespace BMA.EHR.Application.Repositories var type3_level11 = await GetInsigniaCandidate_Type3_Level11(periodId, ocId); var type4_level10 = await GetInsigniaCandidate_Type4_Level10(periodId, ocId); var type4_level11 = await GetInsigniaCandidate_Type4_Level11(periodId, ocId); - var type_coin = await GetInsigniaCandidate(periodId, ocId); + var type = await GetInsigniaCandidate(periodId, ocId); // union result + foreach (var r in type_coin) + { + var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId); + if (old == null) + result_candidate.Add(r); + } foreach (var r in type4_level11) { var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId); @@ -5474,7 +5480,7 @@ namespace BMA.EHR.Application.Repositories if (old == null) result_candidate.Add(r); } - foreach (var r in type_coin) + foreach (var r in type) { var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId); if (old == null) @@ -5520,64 +5526,105 @@ namespace BMA.EHR.Application.Repositories } } - // - /// กรองรายชื่อผู้มิสิทธิ์ยื่นขอเหรียญจักรพรรดิมาลา - /// - /// รหัสของรอบการขอ - /// รหัสโรงเรียน - /// - // public async List GetCoinCandidate(Guid periodId, Guid ocId) - // { - // try - // { + //กรองรายชื่อผู้มิสิทธิ์ยื่นขอเหรียญจักรพรรดิมาลา + public async Task> GetCoinCandidate(Guid periodId, Guid ocId) + { + try + { + var allOc = GetAllIdByRoot(ocId); - // var allOc = profileService.GetAllIdByRoot(ocId); + var period = await _dbContext.Set().FirstOrDefaultAsync(p => p.Id == periodId); - // var period = await _dbContext.Set().FirstOrDefault(p => p.Id == periodId); + if (period == null) + throw new Exception(GlobalMessages.CoinPeriodNotFound); - // if (period == null) - // throw new Exception(GlobalMessages.CoinPeriodNotFound); + var oc = await _dbContext.Set().FirstOrDefaultAsync(x => x.Id == ocId); - // var oc = await _dbContext.Set().FirstOrDefault(x => x.OcId == ocId); + if (oc == null) + throw new Exception(GlobalMessages.OCNotFound); - // if (oc == null) - // throw new Exception(GlobalMessages.OCNotFound); - // var result = await _dbContext.Set() - // .Include(p => p.Position) - // .Include(p => p.PosNo) - // .Include(p => p.PositionLevel) - // .Include(p => p.Insignias) - // .ThenInclude(i => i.Insignia) - // .Include(p => p.Salaries) - // .Where(p => allOc.Contains(p.OrganizationChart.OcId) - // && p.IsLeave == false - // && p.IsActive == true - // && p.DateAppoint != null - // && p.DateAppoint.Value.CalculateGovAgeInYear(0, 0).ToInteger() >= 25) - // .Select(p => new InsigniaResultSet - // { - // ProfileId = p.Id, - // Prefix = p.Prefix, - // FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", - // Position = p.Position.Name, - // Rank = p.PositionLevel.Name, - // GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), - // LastInsignia = p.Insignias.Count == 0 ? "" : p.Insignias.OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Name, - // Salary = p.Salaries.Count() == 0 ? null : p.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, - // PosNo = p.PosNo == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PosNo.Id, - // RequestInsignia = GetInsigniaByName("เหรียญจักรพรรดิมาลา") - // }); + var inst_profile = _dbContext.Set() + .Include(p => p.Prefix) + .Include(p => p.Position) + .Include(p => p.PosNo) + .Include(p => p.PositionType) + .Include(p => p.PositionLevel) + .Include(p => p.Insignias) + .ThenInclude(i => i.Insignia) + .Include(p => p.Salaries) + .Where(p => + allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value) && + p.IsActive == true && + p.IsLeave == false && + p.DateAppoint != null + ) + .Select(p => new + { + ProfileId = p.Id, + Prefix = p.Prefix == null ? null : p.Prefix.Name, + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", + Position = p.Position == null ? null : p.Position.Name, + Rank = p.PositionLevel == null ? null : p.PositionLevel.Name, + ProfileDateAppoint = p.DateAppoint.Value, + GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), + PosNo = p.PosNo == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PosNo.Id, + Gender = p.Gender == null ? null : p.Gender.Name, + LastInsignia = p.Insignias.Count == 0 ? "" : p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Name, + LastInsigniaId = p.Insignias.Count == 0 ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Id, + Salary = p.Salaries.Count() == 0 ? null : p.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, + }); - // result = result.Where(x => !x.LastInsignia.Contains("เหรียญจักรพรรดิมาลา")); + // check วันที่บรรจะต้องมากกว่า 25 ปี + var result = ((from p in inst_profile + where p.ProfileDateAppoint <= new DateTime(period.Year - 25, 5, 29) + select p) + .ToList() + .Select(p => new InsigniaResultSet + { + ProfileId = p.ProfileId, + Prefix = p.Prefix, + FullName = p.FullName, + Position = p.Position, + PosNo = p.PosNo, + Rank = p.Rank, + GovAge = p.GovAge, + LastInsignia = p.LastInsignia, + LastInsigniaId = p.LastInsigniaId, + Salary = p.Salary, + RequestInsignia = GetInsigniaByName("เหรียญจักรพรรดิมาลา"), + Seq = 1, + Gender = p.Gender, + MatchingConditions = new List(), + })).ToList(); - // return result.ToList(); - // } - // catch - // { - // throw; - // } - // } + var result_candidate = new List(); + + foreach (var r in result) + { + var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId); + + // Check ได้รับหรือเคยยื่นขอไปในปีที่แล้วหรือไม่? + if (!CanRequestInsignia(r.ProfileId, period.Year)) + continue; + + // Check ว่าชั้นที่ขอสูงกว่าชั้นที่เคยได้รับแล้วหรือไม่? + if (!IsHigherLevel2(r.LastInsignia, r.RequestInsignia.Name)) + continue; + + if (old == null) + { + result_candidate.Add(r); + } + } + + return result_candidate; + } + catch + { + throw; + } + } #endregion diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index c93ac4f9..83da2a99 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -911,23 +911,23 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync(); foreach (var insigniaPeriod in insigniaPeriods) { - // if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date) - // { - await _repositoryNoti.PushNotificationAsync( - Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"), - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round} {insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date}", - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round} {DateTime.Now.Date}", - "", - true - ); - await _repositoryNoti.PushNotificationAsync( - Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"), - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", - "", - true - ); - // } + if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date) + { + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"), + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + "", + true + ); + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"), + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + "", + true + ); + } } } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index ece5a07f..9bf8ec95 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1151,6 +1151,8 @@ namespace BMA.EHR.Placement.Service.Controllers FirstName = x.Profile.FirstName, LastName = x.Profile.LastName, CitizenId = x.Profile.CitizenId, + Position = x.OrganizationPosition.PositionMaster.PositionPath == null ? "-" : x.OrganizationPosition.PositionMaster.PositionPath.Name, + PositionLevel = x.Profile.PositionLevel == null ? "-" : x.Profile.PositionLevel.Name, IsDirector = x.OrganizationPosition.PositionMaster.IsDirector, }) .ToListAsync(); @@ -1173,6 +1175,8 @@ namespace BMA.EHR.Placement.Service.Controllers FirstName = x.Profile.FirstName, LastName = x.Profile.LastName, CitizenId = x.Profile.CitizenId, + Position = x.Profile.Position == null ? "-" : x.Profile.Position.Name, + PositionLevel = x.Profile.PositionLevel == null ? "-" : x.Profile.PositionLevel.Name, IsDirector = x.OrganizationPosition.PositionMaster.IsDirector, }) .ToListAsync(); diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp index 31cc58f2..7004416f 100644 Binary files a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp and b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp index 35a2941f..556463be 100644 Binary files a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp and b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ-1.trdp differ diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index d9dfd9d9..c9b62cf8 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -141,6 +141,96 @@ namespace BMA.EHR.Retirement.Service.Controllers return 999999999; return index; } + + private async Task GetAgency(Guid profileId) + { + var organizationAgency = "-"; + var _profile = await _context.Profiles + .Where(x => x.Id == profileId) + .FirstOrDefaultAsync(); + if (_profile != null) + { + if (_profile.ProfileType == "officer") + { + var organization = await _context.Organizations + .Where(x => x.Id == _profile.OcId) + .FirstOrDefaultAsync(); + if (organization != null) + { + var _organizationAgency = await _context.Organizations + .Include(x => x.OrganizationOrganization) + .Where(x => x.Id == organization.OrganizationAgencyId) + .FirstOrDefaultAsync(); + if (_organizationAgency != null && _organizationAgency.OrganizationOrganization != null) + { + organizationAgency = _organizationAgency.OrganizationOrganization.Name; + } + } + } + else + { + var profilePosition = await _context.OrganizationEmployees + .Include(x => x.OrganizationAgency) + .ThenInclude(x => x.OrganizationOrganization) + .Where(x => x.Organization != null) + .Where(x => x.OrganizationAgency != null) + .Where(x => x.OrganizationAgency.OrganizationOrganization != null) + .Where(x => x.OrganizationAgency.OrganizationOrganization.Name != null) + .Where(x => x.Organization.Id == _profile.OcId) + .FirstOrDefaultAsync(); + if (profilePosition != null) + { + organizationAgency = profilePosition.OrganizationAgency.OrganizationOrganization.Name; + } + } + } + return organizationAgency; + } + + private async Task GetGovermentAgency(Guid profileId) + { + var organizationGovernmentAgency = "-"; + var _profile = await _context.Profiles + .Where(x => x.Id == profileId) + .FirstOrDefaultAsync(); + if (_profile != null) + { + if (_profile.ProfileType == "officer") + { + var organization = await _context.Organizations + .Where(x => x.Id == _profile.OcId) + .FirstOrDefaultAsync(); + if (organization != null) + { + var _organizationGovernmentAgency = await _context.Organizations + .Include(x => x.OrganizationOrganization) + .Where(x => x.Id == organization.OrganizationGovernmentAgencyId) + .FirstOrDefaultAsync(); + if (_organizationGovernmentAgency != null && _organizationGovernmentAgency.OrganizationOrganization != null) + { + organizationGovernmentAgency = _organizationGovernmentAgency.OrganizationOrganization.Name; + } + } + } + else + { + var profilePosition = await _context.OrganizationEmployees + .Include(x => x.OrganizationGovernmentAgency) + .ThenInclude(x => x.OrganizationOrganization) + .Where(x => x.Organization != null) + .Where(x => x.OrganizationGovernmentAgency != null) + .Where(x => x.OrganizationGovernmentAgency.OrganizationOrganization != null) + .Where(x => x.OrganizationGovernmentAgency.OrganizationOrganization.Name != null) + .Where(x => x.Organization.Id == _profile.OcId) + .FirstOrDefaultAsync(); + if (profilePosition != null) + { + organizationGovernmentAgency = profilePosition.OrganizationGovernmentAgency.OrganizationOrganization.Name; + } + } + } + return organizationGovernmentAgency; + } #endregion /// @@ -308,6 +398,9 @@ namespace BMA.EHR.Retirement.Service.Controllers var profile_olds = new List(); foreach (var r in profile_old) { + var organizationAgency = await GetAgency(r.profileId); + var organizationGovernmentAgency = await GetGovermentAgency(r.profileId); + var data = new ProfileJsonRequest { order = r.order, @@ -328,6 +421,8 @@ namespace BMA.EHR.Retirement.Service.Controllers positionEmployeeLevel = r.positionEmployeeLevel, positionEmployeeGroup = r.positionEmployeeGroup, posNoEmployee = r.posNoEmployee, + organizationAgency = organizationAgency,//หน่วยงานต้นสังกัด + organizationGovernmentAgency = organizationGovernmentAgency,//ส่วนราชการต้นสังกัด }; profile_olds.Add(data); } @@ -465,6 +560,9 @@ namespace BMA.EHR.Retirement.Service.Controllers var profile_news = new List(); foreach (var r in profile_new) { + var organizationAgency = await GetAgency(r.profileId); + var organizationGovernmentAgency = await GetGovermentAgency(r.profileId); + var data = new ProfileJsonRequest { order = r.order, @@ -485,6 +583,8 @@ namespace BMA.EHR.Retirement.Service.Controllers positionEmployeeLevel = r.positionEmployeeLevel, positionEmployeeGroup = r.positionEmployeeGroup, posNoEmployee = r.posNoEmployee, + organizationAgency = organizationAgency,//หน่วยงานต้นสังกัด + organizationGovernmentAgency = organizationGovernmentAgency,//ส่วนราชการต้นสังกัด }; profile_news.Add(data); } @@ -553,6 +653,9 @@ namespace BMA.EHR.Retirement.Service.Controllers var profile_news = new List(); foreach (var r in profile_new) { + var organizationAgency = await GetAgency(r.profileId); + var organizationGovernmentAgency = await GetGovermentAgency(r.profileId); + var data = new ProfileJsonRequest { order = r.order, @@ -573,6 +676,8 @@ namespace BMA.EHR.Retirement.Service.Controllers positionEmployeeLevel = r.positionEmployeeLevel, positionEmployeeGroup = r.positionEmployeeGroup, posNoEmployee = r.posNoEmployee, + organizationAgency = organizationAgency,//หน่วยงานต้นสังกัด + organizationGovernmentAgency = organizationGovernmentAgency,//ส่วนราชการต้นสังกัด }; profile_news.Add(data); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index b4208c72..2b8d151d 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -144,12 +144,12 @@ namespace BMA.EHR.Retirement.Service.Controllers p.Status, p.Amount, p.RecruitDate, - PosNoId = p.PositionNumber == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumber.Id, - PositionId = p.PositionPath == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPath.Id, - PositionPathSideId = p.PositionPathSide == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionPathSide.Id, - PositionTypeId = p.PositionType == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionType.Id, - PositionLineId = p.PositionLine == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLine.Id, - PositionLevelId = p.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevel.Id, + PosNo = p.PositionNumber == null ? "-" : p.PositionNumber.Name, + Position = p.PositionPath == null ? "-" : p.PositionPath.Name, + PositionPathSide = p.PositionPathSide == null ? "-" : p.PositionPathSide.Name, + PositionType = p.PositionType == null ? "-" : p.PositionType.Name, + PositionLine = p.PositionLine == null ? "-" : p.PositionLine.Name, + PositionLevel = p.PositionLevel == null ? "-" : p.PositionLevel.Name, OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id, p.CreatedAt, p.Reason, @@ -198,12 +198,12 @@ namespace BMA.EHR.Retirement.Service.Controllers data.Status, data.Amount, data.RecruitDate, - data.PosNoId, - data.PositionId, - data.PositionPathSideId, - data.PositionTypeId, - data.PositionLineId, - data.PositionLevelId, + data.PosNo, + data.Position, + data.PositionPathSide, + data.PositionType, + data.PositionLine, + data.PositionLevel, data.OrganizationPositionId, data.CreatedAt, data.Reason, @@ -267,6 +267,13 @@ namespace BMA.EHR.Retirement.Service.Controllers PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name, PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", + PositionNumber = profile.PosNo, + PositionPath = profile.Position, + PositionPathSide = await _context.PositionPathSides.FindAsync(profile.PositionPathSideId), + PositionType = profile.PositionType, + PositionLine = await _context.PositionLines.FindAsync(profile.PositionLineId), + PositionLevel = profile.PositionLevel, + // OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id, Status = "WAITTING", CreatedUserId = UserId ?? "System Administrator", CreatedFullName = FullName ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 6781d1e1..933b452b 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -354,8 +354,8 @@ namespace BMA.EHR.Retirement.Service.Controllers } await _repositoryNoti.PushNotificationAsync( Guid.Parse("08db721d-ae2f-4f5d-836a-02d2413df33d"), - $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำลาออก", - $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำลาออก", + $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นขอลาออก", + $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นขอลาออก", "", true ); diff --git a/BMA.EHR.Retirement.Service/Requests/ProfileJsonRequest.cs b/BMA.EHR.Retirement.Service/Requests/ProfileJsonRequest.cs index 356e8b67..e54bfd6b 100644 --- a/BMA.EHR.Retirement.Service/Requests/ProfileJsonRequest.cs +++ b/BMA.EHR.Retirement.Service/Requests/ProfileJsonRequest.cs @@ -23,5 +23,7 @@ namespace BMA.EHR.Retirement.Service.Requests public string? positionEmployeeLevel { get; set; } public string? positionEmployeeGroup { get; set; } public string? posNoEmployee { get; set; } + public string? organizationAgency { get; set; } + public string? organizationGovernmentAgency { get; set; } } }