Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
This commit is contained in:
commit
30ff1ae15c
1 changed files with 128 additions and 114 deletions
|
|
@ -151,6 +151,17 @@ namespace BMA.EHR.Application.Repositories
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool IsHigherLevel(BMA.EHR.Application.Responses.Profiles.ProfileInsignia? last, string request)
|
||||||
|
{
|
||||||
|
if (last == null)
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var last_ins = last.Insignia?.ToLower().Trim() ?? "";
|
||||||
|
return IsHigherLevel(last_ins, request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static bool IsHigherLevel(string last, string request)
|
private static bool IsHigherLevel(string last, string request)
|
||||||
{
|
{
|
||||||
if (request.Contains("ตริตาภรณ์ช้างเผือก"))
|
if (request.Contains("ตริตาภรณ์ช้างเผือก"))
|
||||||
|
|
@ -395,82 +406,85 @@ namespace BMA.EHR.Application.Repositories
|
||||||
var jtmRoyal = await _dbContext.Set<Insignia>()
|
var jtmRoyal = await _dbContext.Set<Insignia>()
|
||||||
.FirstOrDefaultAsync(x => x.Name.Contains("จัตุรถาภรณ์มงกุฎไทย"));
|
.FirstOrDefaultAsync(x => x.Name.Contains("จัตุรถาภรณ์มงกุฎไทย"));
|
||||||
|
|
||||||
var s2 = (from p in allProfilesByRoot
|
var s2_a = (from p in allProfilesByRoot
|
||||||
where p.ProfileInsignia != null
|
where p.ProfileInsignia != null
|
||||||
&& p.ProfileInsignia.Count > 0
|
&& p.ProfileInsignia.Count > 0
|
||||||
&& (p.ProfileInsignia.Where(x => x.InsigniaId.Value != coinInsignia.Id &&
|
&& (p.ProfileInsignia.Where(x => x.InsigniaId.Value != coinInsignia.Id &&
|
||||||
x.InsigniaId.Value == bcpRoyal.Id)
|
x.InsigniaId.Value == bcpRoyal.Id)
|
||||||
.ToList()
|
.ToList()
|
||||||
.Count() == 0)
|
.Count() == 0)
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
ProfileId = p.Id,
|
ProfileId = p.Id,
|
||||||
p.CitizenId,
|
p.CitizenId,
|
||||||
p.FirstName,
|
p.FirstName,
|
||||||
p.LastName,
|
p.LastName,
|
||||||
p.BirthDate,
|
p.BirthDate,
|
||||||
p.DateAppoint,
|
p.DateAppoint,
|
||||||
Prefix = p.Prefix ?? "",
|
Prefix = p.Prefix ?? "",
|
||||||
FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
|
FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
|
||||||
Position = p.Position ?? "",
|
Position = p.Position ?? "",
|
||||||
Rank = p.PosLevel ?? "",
|
Rank = p.PosLevel ?? "",
|
||||||
ProfileDateAppoint = p.DateAppoint.Value,
|
ProfileDateAppoint = p.DateAppoint.Value,
|
||||||
GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
|
GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
|
||||||
PosNo = p.PosNo,
|
PosNo = p.PosNo,
|
||||||
PositionLevelId = p.PosLevelId,
|
PositionLevelId = p.PosLevelId,
|
||||||
PositionLevelName = p.PosLevel,
|
PositionLevelName = p.PosLevel,
|
||||||
PositionTypeId = p.PosTypeId,
|
PositionTypeId = p.PosTypeId,
|
||||||
PositionTypeName = p.PosType,
|
PositionTypeName = p.PosType,
|
||||||
Gender = p.Gender ?? "",
|
Gender = p.Gender ?? "",
|
||||||
PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
|
PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
|
||||||
Amount = p.Amount ?? 0,
|
Amount = p.Amount ?? 0,
|
||||||
RootId = p.RootId,
|
RootId = p.RootId,
|
||||||
RootDnaId = p.RootDnaId,
|
RootDnaId = p.RootDnaId,
|
||||||
Root = p.Root,
|
Root = p.Root,
|
||||||
Child1Id = p.Child1Id,
|
Child1Id = p.Child1Id,
|
||||||
Child1DnaId = p.Child1DnaId,
|
Child1DnaId = p.Child1DnaId,
|
||||||
Child1 = p.Child1,
|
Child1 = p.Child1,
|
||||||
Child2Id = p.Child2Id,
|
Child2Id = p.Child2Id,
|
||||||
Child2DnaId = p.Child2DnaId,
|
Child2DnaId = p.Child2DnaId,
|
||||||
Child2 = p.Child2,
|
Child2 = p.Child2,
|
||||||
Child3Id = p.Child3Id,
|
Child3Id = p.Child3Id,
|
||||||
Child3DnaId = p.Child3DnaId,
|
Child3DnaId = p.Child3DnaId,
|
||||||
Child3 = p.Child3,
|
Child3 = p.Child3,
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0
|
LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0
|
||||||
? null
|
? null
|
||||||
: p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!
|
: p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!
|
||||||
.Insignia,
|
.Insignia,
|
||||||
LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0
|
LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0
|
||||||
? Guid.Parse("00000000-0000-0000-0000-000000000000")
|
? Guid.Parse("00000000-0000-0000-0000-000000000000")
|
||||||
: p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
|
: p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
|
||||||
Salary = p.Amount,
|
Salary = p.Amount,
|
||||||
SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
|
SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
|
||||||
p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
|
p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
|
||||||
.OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
|
.OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
|
||||||
.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
|
.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
|
||||||
.OrderByDescending(x => x.Order).FirstOrDefault().Amount :
|
.OrderByDescending(x => x.Order).FirstOrDefault().Amount :
|
||||||
p.Amount,
|
p.Amount,
|
||||||
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
IsHigherLevel =
|
||||||
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
IsHigherLevel(p.ProfileInsignia.ToList()
|
||||||
.OrderByDescending(x => x.Year)
|
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
||||||
.FirstOrDefault().Insignia,
|
.OrderByDescending(x => x.Year)
|
||||||
"เบญจมาภรณ์ช้างเผือก"),
|
.FirstOrDefault(),
|
||||||
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
"เบญจมาภรณ์ช้างเผือก"),
|
||||||
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
FirstRecvInsigniaYear = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? 0 :
|
||||||
.FirstOrDefault() == null ? 0 :
|
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
||||||
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
.FirstOrDefault() == null ? 0 :
|
||||||
.FirstOrDefault().Year,
|
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
||||||
ProfileType = p.ProfileType,
|
.FirstOrDefault().Year,
|
||||||
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
MarkDiscipline = p.MarkDiscipline,
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
MarkInsignia = p.MarkInsignia,
|
MarkInsignia = p.MarkInsignia,
|
||||||
MarkLeave = p.MarkLeave,
|
MarkLeave = p.MarkLeave,
|
||||||
MarkRate = p.MarkRate
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList();
|
||||||
|
|
||||||
|
var s2 = s2_a
|
||||||
.Where(x => (x.SalaryCondition >= 8340 && x.SalaryCondition < 10150) && !x.IsHigherLevel)
|
.Where(x => (x.SalaryCondition >= 8340 && x.SalaryCondition < 10150) && !x.IsHigherLevel)
|
||||||
.Where(x => x.FirstRecvInsigniaYear != 0 && x.FirstRecvInsigniaYear <= period.Year - 5)
|
.Where(x => x.FirstRecvInsigniaYear != 0 && x.FirstRecvInsigniaYear <= period.Year - 5)
|
||||||
.Select(p => new InsigniaResultSet
|
.Select(p => new InsigniaResultSet
|
||||||
|
|
@ -584,7 +598,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
||||||
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"จัตุรถาภรณ์มงกุฎไทย"),
|
"จัตุรถาภรณ์มงกุฎไทย"),
|
||||||
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
||||||
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
||||||
|
|
@ -950,7 +964,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
||||||
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"จัตุรถาภรณ์มงกุฎไทย"),
|
"จัตุรถาภรณ์มงกุฎไทย"),
|
||||||
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
||||||
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcpRoyal.Id).OrderBy(x => x.Year)
|
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcpRoyal.Id).OrderBy(x => x.Year)
|
||||||
|
|
@ -1092,7 +1106,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
|
||||||
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
.Where(x => x.InsigniaId.Value != coinInsignia.Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"จัตุรถาภรณ์ช้างเผือก"),
|
"จัตุรถาภรณ์ช้างเผือก"),
|
||||||
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
|
||||||
p.ProfileInsignia.Where(x => x.InsigniaId.Value == jtmRoyal.Id).OrderBy(x => x.Year)
|
p.ProfileInsignia.Where(x => x.InsigniaId.Value == jtmRoyal.Id).OrderBy(x => x.Year)
|
||||||
|
|
@ -1460,7 +1474,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
IsHigherLevel = IsHigherLevel(p.ProfileInsignia
|
IsHigherLevel = IsHigherLevel(p.ProfileInsignia
|
||||||
.Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
.Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"เบญจมาภรณ์ช้างเผือก"),
|
"เบญจมาภรณ์ช้างเผือก"),
|
||||||
PositionSalaryAmount = p.PositionSalaryAmount,
|
PositionSalaryAmount = p.PositionSalaryAmount,
|
||||||
Amount = p.Amount,
|
Amount = p.Amount,
|
||||||
|
|
@ -1613,7 +1627,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"จัตุรถาภรณ์มงกุฎไทย"),
|
"จัตุรถาภรณ์มงกุฎไทย"),
|
||||||
PositionSalaryAmount = p.PositionSalaryAmount,
|
PositionSalaryAmount = p.PositionSalaryAmount,
|
||||||
Amount = p.Amount,
|
Amount = p.Amount,
|
||||||
|
|
@ -1759,7 +1773,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"จัตุรถาภรณ์ช้างเผือก"),
|
"จัตุรถาภรณ์ช้างเผือก"),
|
||||||
PositionSalaryAmount = p.PositionSalaryAmount,
|
PositionSalaryAmount = p.PositionSalaryAmount,
|
||||||
Amount = p.Amount,
|
Amount = p.Amount,
|
||||||
|
|
@ -2012,7 +2026,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ตริตาภรณ์มงกุฎไทย"),
|
"ตริตาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -2158,7 +2172,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ตริตาภรณ์ช้างเผือก"),
|
"ตริตาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -2376,7 +2390,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์มงกุฎไทย"),
|
"ทวีติยาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -2527,7 +2541,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์ช้างเผือก"),
|
"ทวีติยาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -2746,7 +2760,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์ช้างเผือก"),
|
"ทวีติยาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -2898,7 +2912,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์มงกุฎไทย"),
|
"ประถมาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -3059,7 +3073,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -3305,7 +3319,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ตริตาภรณ์มงกุฎไทย"),
|
"ตริตาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -3510,7 +3524,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ตริตาภรณ์ช้างเผือก"),
|
"ตริตาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -3668,7 +3682,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์มงกุฎไทย"),
|
"ทวีติยาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -3829,7 +3843,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์ช้างเผือก"),
|
"ทวีติยาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -4074,7 +4088,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์ช้างเผือก"),
|
"ทวีติยาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -4215,7 +4229,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์มงกุฎไทย"),
|
"ประถมาภรณ์มงกุฎไทย"),
|
||||||
|
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
|
|
@ -4449,7 +4463,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์ช้างเผือก"),
|
"ทวีติยาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -4608,7 +4622,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์มงกุฎไทย"),
|
"ประถมาภรณ์มงกุฎไทย"),
|
||||||
|
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
|
|
@ -4769,7 +4783,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -5013,7 +5027,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -5180,7 +5194,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาวชิรมงกุฎ"),
|
"มหาวชิรมงกุฎ"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -5348,7 +5362,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาปรมาภรณ์ช้างเผือก"),
|
"มหาปรมาภรณ์ช้างเผือก"),
|
||||||
|
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
|
|
@ -5596,7 +5610,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -5763,7 +5777,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาวชิรมงกุฎ"),
|
"มหาวชิรมงกุฎ"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -5930,7 +5944,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาปรมาภรณ์ช้างเผือก"),
|
"มหาปรมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -6175,7 +6189,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ทวีติยาภรณ์ช้างเผือก"),
|
"ทวีติยาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -6332,7 +6346,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์มงกุฎไทย"),
|
"ประถมาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -6560,7 +6574,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์มงกุฎไทย"),
|
"ประถมาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -6721,7 +6735,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -6883,7 +6897,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาวชิรมงกุฎ"),
|
"มหาวชิรมงกุฎ"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -7124,7 +7138,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์มงกุฎไทย"),
|
"ประถมาภรณ์มงกุฎไทย"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -7285,7 +7299,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -7446,7 +7460,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาวชิรมงกุฎ"),
|
"มหาวชิรมงกุฎ"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -7658,7 +7672,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"ประถมาภรณ์ช้างเผือก"),
|
"ประถมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -7825,7 +7839,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาวชิรมงกุฎ"),
|
"มหาวชิรมงกุฎ"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
@ -7992,7 +8006,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Where(x => x.InsigniaId.Value !=
|
.Where(x => x.InsigniaId.Value !=
|
||||||
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
|
||||||
.OrderByDescending(x => x.Year)
|
.OrderByDescending(x => x.Year)
|
||||||
.FirstOrDefault().Insignia,
|
.FirstOrDefault(),
|
||||||
"มหาปรมาภรณ์ช้างเผือก"),
|
"มหาปรมาภรณ์ช้างเผือก"),
|
||||||
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
PositionLevel = p.PosLevel == null ? "" : p.PosLevel,
|
||||||
PositionType = p.PosType == null ? "" : p.PosType,
|
PositionType = p.PosType == null ? "" : p.PosType,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue