From eda476458aa557385be63153b6054d776ccd75e1 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 19 Sep 2023 14:25:24 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=95=E0=B8=AD=E0=B8=99=E0=B8=84=E0=B8=B4=E0=B8=A7?= =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B9=88=20fullname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/InsigniaPeriodsRepository.cs | 160 ++++++++++++------ .../Reports/RetireReportRepository.cs | 2 +- .../Controllers/InsigniaManageController.cs | 2 +- .../Controllers/InsigniaRequestController.cs | 8 +- .../Controllers/RetirementController.cs | 6 +- .../Controllers/RetirementResignController.cs | 3 +- 6 files changed, 118 insertions(+), 63 deletions(-) diff --git a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs index 00708c0c..8018877c 100644 --- a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs +++ b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs @@ -225,6 +225,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var inst_profile = _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -245,7 +246,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, ProfileDateAppoint = p.DateAppoint.Value, @@ -308,6 +309,7 @@ namespace BMA.EHR.Application.Repositories })).ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -330,7 +332,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -385,6 +387,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -407,7 +410,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -550,6 +553,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var inst_profile = _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -570,7 +574,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, ProfileDateAppoint = p.DateAppoint.Value, @@ -631,6 +635,7 @@ namespace BMA.EHR.Application.Repositories })).ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -653,7 +658,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -708,6 +713,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -730,7 +736,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -878,6 +884,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var inst_profile = _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -898,7 +905,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, ProfileDateAppoint = p.DateAppoint.Value, @@ -948,6 +955,7 @@ namespace BMA.EHR.Application.Repositories })).ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -971,7 +979,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -1023,6 +1031,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1046,7 +1055,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -1092,6 +1101,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s4 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1115,7 +1125,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -1274,6 +1284,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1297,7 +1308,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -1345,6 +1356,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1370,7 +1382,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -1492,6 +1504,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1515,7 +1528,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -1563,6 +1576,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1588,7 +1602,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -1711,6 +1725,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1734,7 +1749,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -1782,6 +1797,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1807,7 +1823,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -1861,6 +1877,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -1886,7 +1903,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2033,6 +2050,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var inst_profile = _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2053,7 +2071,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, Rank = p.PositionLevel.Name, ProfileDateAppoint = p.DateAppoint.Value, @@ -2157,6 +2175,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2180,7 +2199,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2228,6 +2247,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2251,7 +2271,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2300,6 +2320,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2323,7 +2344,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2461,6 +2482,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2484,7 +2506,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2532,6 +2554,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2555,7 +2578,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2685,6 +2708,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2708,7 +2732,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2756,6 +2780,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2779,7 +2804,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2832,6 +2857,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -2855,7 +2881,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -2997,6 +3023,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3021,7 +3048,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3081,6 +3108,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3105,7 +3133,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3167,6 +3195,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3190,7 +3219,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3341,6 +3370,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3364,7 +3394,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3424,6 +3454,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3448,7 +3479,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3509,6 +3540,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3532,7 +3564,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3679,6 +3711,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3702,7 +3735,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3750,6 +3783,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3773,7 +3807,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3896,6 +3930,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3919,7 +3954,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -3971,6 +4006,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -3994,7 +4030,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4046,6 +4082,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4069,7 +4106,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4209,6 +4246,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4232,7 +4270,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4284,6 +4322,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4307,7 +4346,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4359,6 +4398,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4382,7 +4422,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4494,6 +4534,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var s1 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4517,7 +4558,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4577,6 +4618,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4600,7 +4642,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4660,6 +4702,7 @@ namespace BMA.EHR.Application.Repositories .ToList(); var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.PositionType) @@ -4683,7 +4726,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PositionLevel = p.PositionLevel.Name, PositionType = p.PositionType.Name, @@ -4815,6 +4858,7 @@ namespace BMA.EHR.Application.Repositories var CurrentRetireDate = new DateTime(period.Year, 9, 30); var inst_profile = _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -4832,7 +4876,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, ProfileDateAppoint = p.DateAppoint.Value, @@ -4868,6 +4912,7 @@ namespace BMA.EHR.Application.Repositories })).ToList(); var s2 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -4885,7 +4930,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -4919,6 +4964,7 @@ namespace BMA.EHR.Application.Repositories // คศ2 ขอ ทม var s3 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -4936,7 +4982,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -4969,6 +5015,7 @@ namespace BMA.EHR.Application.Repositories // คศ2 ขอ ทช var s4 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -4986,7 +5033,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -5020,6 +5067,7 @@ namespace BMA.EHR.Application.Repositories // คศ3 ขอ ทช var s5 = ((from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -5038,7 +5086,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position.Name, PosNo = p.PosNo == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PosNo.Id, Rank = p.PositionLevel.Name, @@ -5054,6 +5102,7 @@ namespace BMA.EHR.Application.Repositories // คศ3 ขอ ปม var s6 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -5071,7 +5120,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -5106,6 +5155,7 @@ namespace BMA.EHR.Application.Repositories // คศ4 ขอ ปม var s7 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -5123,7 +5173,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -5157,6 +5207,7 @@ namespace BMA.EHR.Application.Repositories // คศ4 ขอ ปชa var s8 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -5174,7 +5225,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -5208,6 +5259,7 @@ namespace BMA.EHR.Application.Repositories // คศ4 ขอ มวม var s9 = (from p in _dbContext.Set() + .Include(p => p.Prefix) .Include(p => p.Position) .Include(p => p.PosNo) .Include(p => p.Insignias) @@ -5225,7 +5277,7 @@ namespace BMA.EHR.Application.Repositories { ProfileId = p.Id, Prefix = p.Prefix == null ? null : p.Prefix.Name, - FullName = $"{p.FirstName} {p.LastName}", + FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}", Position = p.Position == null ? null : p.Position.Name, Rank = p.PositionLevel.Name, GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0), @@ -5507,7 +5559,7 @@ namespace BMA.EHR.Application.Repositories // { // ProfileId = p.Id, // Prefix = p.Prefix, - // FullName = $"{p.FirstName} {p.LastName}", + // 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), @@ -5721,6 +5773,8 @@ namespace BMA.EHR.Application.Repositories .ThenInclude(x => x.PositionLevel) .Include(x => x.Profile) .ThenInclude(x => x.PositionType) + .Include(x => x.Profile) + .ThenInclude(x => x.Prefix) //.Include(x => x.Profile) //.ThenInclude(x => x.OrganizationOrganization) .Include(x => x.Profile) diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs index 3ec81cfb..987e6340 100644 --- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -137,7 +137,7 @@ namespace BMA.EHR.Application.Repositories.Reports profileId = x.Profile.Id, citizenId = x.Profile.CitizenId, prefix = x.Profile.Prefix == null ? string.Empty : x.Profile.Prefix.Name, - fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", organizationOrganization = x.Profile.OrganizationOrganization, ocId = x.Profile.OcId, position = x.Profile.Position == null ? string.Empty : x.Profile.Position.Name, diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs index 3e021a18..e34fb200 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs @@ -555,7 +555,7 @@ namespace BMA.EHR.Insignia.Service.Controllers Position = p.InsigniaNoteProfile.Profile.Position == null ? null : p.InsigniaNoteProfile.Profile.Position.Name, p.InsigniaNoteProfile.Profile.CitizenId, p.InsigniaNoteProfile.Profile.ProfileType, - FullName = $"{p.InsigniaNoteProfile.Profile.FirstName} {p.InsigniaNoteProfile.Profile.LastName}", + FullName = $"{(p.InsigniaNoteProfile.Profile.Prefix == null ? null : p.InsigniaNoteProfile.Profile.Prefix.Name)}{p.InsigniaNoteProfile.Profile.FirstName} {p.InsigniaNoteProfile.Profile.LastName}", RequestInsignia = p.InsigniaNoteProfile.RequestInsignia == null ? null : p.InsigniaNoteProfile.RequestInsignia.Name, RequestInsigniaId = p.InsigniaNoteProfile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.InsigniaNoteProfile.RequestInsignia.Id, RequestInsigniaShortName = p.InsigniaNoteProfile.RequestInsignia == null ? null : p.InsigniaNoteProfile.RequestInsignia.ShortName, diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs index ac09df71..66ebe246 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs @@ -1241,7 +1241,7 @@ namespace BMA.EHR.Insignia.Service.Controllers ProfileType = x.Profile.ProfileType, OcId = x.Profile.OcId, CitizenId = x.Profile.CitizenId, - FullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + FullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", RequestInsignia = x.RequestInsignia.Name, RequestInsigniaId = x.RequestInsignia.Id, RequestInsigniaShortName = x.RequestInsignia.ShortName, @@ -1320,7 +1320,7 @@ namespace BMA.EHR.Insignia.Service.Controllers ProfileType = x.Profile.ProfileType, OcId = x.Profile.OcId, CitizenId = x.Profile.CitizenId, - FullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + FullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", RequestInsignia = x.RequestInsignia.Name, RequestInsigniaId = x.RequestInsignia.Id, RequestInsigniaShortName = x.RequestInsignia.ShortName, @@ -1858,7 +1858,7 @@ namespace BMA.EHR.Insignia.Service.Controllers Position = profile.Profile.Position == null ? null : profile.Profile.Position.Name, profile.Profile.CitizenId, profile.Profile.ProfileType, - FullName = $"{profile.Profile.FirstName} {profile.Profile.LastName}", + FullName = $"{profile.Profile.Prefix?.Name}{profile.Profile.FirstName} {profile.Profile.LastName}", RequestInsignia = profile.RequestInsignia == null ? null : profile.RequestInsignia.Name, RequestInsigniaId = profile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : profile.RequestInsignia.Id, RequestInsigniaShortName = profile.RequestInsignia == null ? null : profile.RequestInsignia.ShortName, @@ -1956,7 +1956,7 @@ namespace BMA.EHR.Insignia.Service.Controllers Position = profile.Profile.Position == null ? null : profile.Profile.Position.Name, profile.Profile.CitizenId, profile.Profile.ProfileType, - FullName = $"{profile.Profile.FirstName} {profile.Profile.LastName}", + FullName = $"{profile.Profile.Prefix?.Name}{profile.Profile.FirstName} {profile.Profile.LastName}", RequestInsignia = profile.RequestInsignia == null ? null : profile.RequestInsignia.Name, RequestInsigniaId = profile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : profile.RequestInsignia.Id, RequestInsigniaShortName = profile.RequestInsignia == null ? null : profile.RequestInsignia.ShortName, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index 538445fe..f8ff68d2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -291,7 +291,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = x.Profile.Id, citizenId = x.Profile.CitizenId, prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name, - fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", organizationOrganization = x.Profile.OrganizationOrganization, ocId = x.Profile.OcId, position = x.Profile.Position == null ? null : x.Profile.Position.Name, @@ -449,7 +449,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = x.Profile.Id, citizenId = x.Profile.CitizenId, prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name, - fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", organizationOrganization = x.Profile.OrganizationOrganization, ocId = x.Profile.OcId, position = x.Profile.Position == null ? null : x.Profile.Position.Name, @@ -537,7 +537,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = x.Profile.Id, citizenId = x.Profile.CitizenId, prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name, - fullName = $"{x.Profile.FirstName} {x.Profile.LastName}", + fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", organizationOrganization = x.Profile.OrganizationOrganization, ocId = x.Profile.OcId, position = x.Profile.Position == null ? null : x.Profile.Position.Name, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 65d21c13..b4cac7f0 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -685,6 +685,7 @@ namespace BMA.EHR.Retirement.Service.Controllers .Select(p => new { Id = p.Id, + Fullname = $"{(p.RetirementResign.Profile.Prefix == null ? null : p.RetirementResign.Profile.Prefix.Name)}{p.RetirementResign.Profile.FirstName} {p.RetirementResign.Profile.LastName}", ReasonWork = p.ReasonWork == null ? p.ReasonWork : Newtonsoft.Json.JsonConvert.DeserializeObject(p.ReasonWork), ReasonWorkOther = p.ReasonWorkOther, TimeThink = p.TimeThink, @@ -730,7 +731,7 @@ namespace BMA.EHR.Retirement.Service.Controllers Position = p.RetirementResign.Profile.Position == null ? null : p.RetirementResign.Profile.Position.Name, PositionLevel = p.RetirementResign.Profile.PositionLevel == null ? null : p.RetirementResign.Profile.PositionLevel.Name, Org = p.RetirementResign.Profile.OcId == null ? null : p.RetirementResign.Profile.OcId, - Fullname = $"{p.RetirementResign.Profile.FirstName} {p.RetirementResign.Profile.LastName}", + Fullname = $"{(p.RetirementResign.Profile.Prefix == null ? null : p.RetirementResign.Profile.Prefix.Name)}{p.RetirementResign.Profile.FirstName} {p.RetirementResign.Profile.LastName}", Prefix = p.RetirementResign.Profile.Prefix == null ? null : p.RetirementResign.Profile.Prefix.Name, Avatar = p.RetirementResign.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.RetirementResign.Profile.Avatar.Id, ReasonWork = p.ReasonWork == null ? p.ReasonWork : Newtonsoft.Json.JsonConvert.DeserializeObject(p.ReasonWork),