Merge branch 'develop' into working

BMA.EHR.Application/Repositories/Commands/CommandRepository.cs

@@ -3574,11 +3574,13 @@ namespace BMA.EHR.Application.Repositories.Commands
 
                     profile.Salaries.Add(salary);
 
+                    var org_pos = await _dbContext.Set<OrganizationPositionEntity>().Include(x => x.PositionNumber).FirstOrDefaultAsync(x => x.PositionNumber.Id == placementProfile.PositionNumber.Id);
+
                     // add profile position
                     var profilePosition = new ProfilePosition
                     {
                         Profile = profile,
-                        OrganizationPosition = placementProfile.OrganizationPosition,
+                        OrganizationPosition = org_pos,
                         IsActive = true,
                         IsPublished = true,
                     };
@@ -3833,11 +3835,13 @@ namespace BMA.EHR.Application.Repositories.Commands
 
                     profile.Salaries.Add(salary);
 
+                    var org_pos = await _dbContext.Set<OrganizationPositionEntity>().Include(x => x.PositionNumber).FirstOrDefaultAsync(x => x.PositionNumber.Id == placementProfile.PositionNumber.Id);
+
                     // add profile position
                     var profilePosition = new ProfilePosition
                     {
                         Profile = profile,
-                        OrganizationPosition = placementProfile.OrganizationPosition,
+                        OrganizationPosition = org_pos,
                         IsActive = true,
                         IsPublished = true,
                     };