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

change fore new field

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-07-16 20:01:24 +07:00
parent d5670f11fd
commit 0324e4c270
12 changed files with 754 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

110
Services/OrganizationReportService.cs
View file

@ -107,12 +107,16 @@ namespace BMA.EHR.Report.Service.Services
{
var ret = new List<Guid>();
var oc = await _context.Organizations.FirstOrDefaultAsync(x => x.Id == id);
var oc = await _context.Organizations
.Select(x => new { x.Id, x.ParentId })
.FirstOrDefaultAsync(x => x.Id == id);
if (oc == null)
throw new Exception(GlobalMessages.DataNotFound);
ret.Add(oc.Id);
var child = await _context.Organizations.AsQueryable().Where(x => x.ParentId == id).ToListAsync();
var child = await _context.Organizations.AsQueryable()
.Select(x => new { x.Id, x.ParentId })
.Where(x => x.ParentId == id).ToListAsync();
if (child.Any())
{
foreach (var item in child)
@ -135,14 +139,18 @@ namespace BMA.EHR.Report.Service.Services
{
var ret = new List<OrganizationItem>();
var oc = await _context.Organizations.FirstOrDefaultAsync(x => x.Id == id);
var oc = await _context.Organizations
.Select(x => new { x.Id, x.ParentId, x.OrganizationOrder })
.FirstOrDefaultAsync(x => x.Id == id);
if (oc == null)
throw new Exception(GlobalMessages.DataNotFound);
var thisLevel = level;
//var thisLevel = oc.OrganizationOrder.Value;
ret.Add(new OrganizationItem { Id = oc.Id, Order = thisLevel.ToString() });
var child = await _context.Organizations.AsQueryable().Where(x => x.ParentId == id).OrderBy(x => x.OrganizationOrder).ToListAsync();
var child = await _context.Organizations.AsQueryable()
.Select(x => new { x.Id, x.ParentId, x.OrganizationOrder })
.Where(x => x.ParentId == id).OrderBy(x => x.OrganizationOrder).ToListAsync();
if (child.Any())
{
var c = 1;
@ -176,7 +184,14 @@ namespace BMA.EHR.Report.Service.Services
public async Task<IEnumerable<dynamic>?> GetOrganizationTypes(string type)
{
var Organizations = await _context.Organizations.ToListAsync();
var Organizations = await _context.Organizations
.Select(x => new
{
Id = x.Id,
OrganizationOrganizationId = x.OrganizationOrganizationId,
OrganizationTypeId = x.OrganizationTypeId,
OrganizationOrder = x.OrganizationOrder
}).ToListAsync();
var OrganizationOrganizations = await _context.OrganizationOrganizations.ToListAsync();
var OrganizationTypes = await _context.OrganizationTypes.FirstOrDefaultAsync(x => x.Name == type);
@ -208,9 +223,41 @@ namespace BMA.EHR.Report.Service.Services
var orgWithOrder = new List<OrganizationItem>();
orgWithOrder = await GetAllOcItemByRootAsync(ocId);
var organizationPositions = await _context.OrganizationPositions.ToListAsync();
var positionMasters = await _context.PositionMasters.ToListAsync();
var organizations = await _context.Organizations.ToListAsync();
var organizationPositions = await _context.OrganizationPositions
.Select(x => new
{
x.Id, x.OrganizationId,
x.PositionUserNote,
x.PositionMasterId,
x.PositionNumberId
}).ToListAsync();
var positionMasters = await _context.PositionMasters
.Select(x => new
{
x.Id,
x.PositionPathId,
x.PositionPathSideId,
x.PositionExecutiveId,
x.PositionExecutiveSideId,
x.PositionTypeId,
x.PositionPathSideObject,
x.PositionExecutiveSideObject,
x.IsDirector
})
.ToListAsync();
var organizations = await _context.Organizations
.Select(x => new
{
Id = x.Id,
OrganizationOrganizationId = x.OrganizationOrganizationId,
OrganizationTypeId = x.OrganizationTypeId,
OrganizationOrder = x.OrganizationOrder,
OrganizationShortNameId = x.OrganizationShortNameId
}).ToListAsync();
var organizationOrganizations = await _applicationDbContext.OrganizationOrganizations.ToListAsync();
var organizationShortNames = await _applicationDbContext.OrganizationShortNames.ToListAsync();
var positionNumbers = await _context.PositionNumbers.ToListAsync();
@ -278,19 +325,59 @@ namespace BMA.EHR.Report.Service.Services
var RootOcName = _profileService.GetOrganizationNameFullPath(organizationId, false, false);
var prefixes = await _applicationDbContext.Prefixes.ToListAsync();
var organizationPositions = await _context.OrganizationPositions.ToListAsync();
//var organizationPositions = await _context.OrganizationPositions.ToListAsync();
var organizationPositions = await _context.OrganizationPositions
.Select(x => new
{
x.Id,
x.OrganizationId,
x.PositionUserNote,
x.PositionMasterId,
x.PositionNumberId
}).ToListAsync();
var profilePositions = await _context.ProfilePositions.ToListAsync();
var positionNumbers = await _context.PositionNumbers.ToListAsync();
var positionPaths = await _applicationDbContext.PositionPaths.ToListAsync();
var positionLevels = await _applicationDbContext.PositionLevels.ToListAsync();
var positionMasters = await _context.PositionMasters.ToListAsync();
//var positionMasters = await _context.PositionMasters.ToListAsync();
var positionMasters = await _context.PositionMasters
.Select(x => new
{
x.Id,
x.PositionPathId,
x.PositionPathSideId,
x.PositionExecutiveId,
x.PositionExecutiveSideId,
x.PositionTypeId,
x.PositionPathSideObject,
x.PositionExecutiveSideObject,
x.IsDirector,
x.Qualification
})
.ToListAsync();
var profiles = await _applicationDbContext.Profiles.ToListAsync();
var organizationShortNames = await _applicationDbContext.OrganizationShortNames.ToListAsync();
var report2s = await _context.Report2s.ToListAsync();
var positionPathSides = await _applicationDbContext.PositionPathSides.ToListAsync();
var positionExecutiveSides = await _applicationDbContext.PositionExecutiveSides.ToListAsync();
var positionExecutives = await _applicationDbContext.PositionExecutives.ToListAsync();
var orgData = await _applicationDbContext.Organizations.ToListAsync();
var orgData = await _applicationDbContext.Organizations
.Select(x => new
{
Id = x.Id,
OrganizationOrganizationId = x.OrganizationOrganizationId,
OrganizationTypeId = x.OrganizationTypeId,
OrganizationOrder = x.OrganizationOrder,
OrganizationShortNameId = x.OrganizationShortNameId
}).ToListAsync();
var positionTypes = await _applicationDbContext.PositionTypes.ToListAsync();
var raw_results = (from op in organizationPositions
@ -455,7 +542,6 @@ namespace BMA.EHR.Report.Service.Services
try
{
var ocIdList = _profileService.GetAllIdByRoot(ocId);
var RootOcName = _profileService.GetOrganizationNameFullPath(ocId, false, false);