Merge branch 'develop' into working
# Conflicts: # BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
This commit is contained in:
commit
18800398b6
4 changed files with 16443 additions and 24 deletions
|
|
@ -1276,7 +1276,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
PositionPathSideId = placementProfile.PositionPathSide == null ? Guid.Empty : placementProfile.PositionPathSide.Id,
|
||||
PositionType = placementProfile.PositionType,
|
||||
PositionLevel = placementProfile.PositionLevel,
|
||||
//PositionEmployeeLevelId = placementProfile.PositionLevel!.Id,
|
||||
//PositionEmployeeLevel = placementProfile.PositionLevel,
|
||||
PositionLineId = placementProfile.PositionLine == null ? Guid.Empty : placementProfile.PositionLine.Id,
|
||||
PositionLine = placementProfile.PositionLine == null ? "" : placementProfile.PositionLine.Name,
|
||||
PosNo = placementProfile.OrganizationPosition!.PositionNumber,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue