hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้โครงสร้างพ้นราชการ

Browse source
This commit is contained in:
Kittapath 2024-05-03 17:39:10 +07:00
parent 18d75f4b04
commit db712d586a
41 changed files with 125142 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

18
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -490,14 +490,14 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.citizenId))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.OrderBy(x => x.citizenId)
.ToListAsync();
@ -551,15 +551,15 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.citizenId))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.OrderBy(x => x.citizenId)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.OrderBy(x => x.citizenId)
.ToListAsync();
// 3. Create new Record
@ -612,14 +612,14 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.citizenId))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.OrderBy(x => x.citizenId)
.ToListAsync();
@ -1630,7 +1630,7 @@ namespace BMA.EHR.Application.Repositories.Commands
// 2. Query
var appointPeople = await _dbContext.Set<PlacementAppointment>()
.Include(x => x.CommandType)
//.Include(x => x.CommandType)
//.Include(x => x.Prefix)
//.Include(x => x.OrganizationPosition)
//.ThenInclude(x => x!.Organization)
@ -10891,7 +10891,7 @@ namespace BMA.EHR.Application.Repositories.Commands
select new
{
r.RefPlacementProfileId,
Position = pf.positionName
Position = pf.position
}).ToListAsync();
if (data.Count > 0)