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

#1425

Browse source
This commit is contained in:
AdisakKanthawilang 2025-06-10 11:10:40 +07:00
parent 6ad83ecc53
commit 9bde6a9895
2 changed files with 250 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

32
BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
View file

@ -1000,16 +1000,36 @@ namespace BMA.EHR.Application.Repositories.Reports
r.FirstName,
r.LastName,
r.Gender,
r.Root,
r.RootId,
r.Child1,
r.Child1Id,
r.Child2,
r.Child2Id,
r.Child3,
r.Child3Id,
r.Child4,
r.Child4Id,
r.RequestInsignia.Id,
r.Request.OrganizationId
})
.Select(group => new
{
{
InsigniaInitial = group.Key.ShortName,
InsigniaName = group.Key.Name,
ProfileId = group.Key.ProfileId,
FullName = $"{group.Key.Prefix}{group.Key.FirstName} {group.Key.LastName}",
Gender = group.Key.Gender,
Root = group.Key.Root ?? "",
RootId = group.Key.RootId,
Child1 = group.Key.Child1 ?? "",
Child1Id = group.Key.Child1Id,
Child2 = group.Key.Child2 ?? "",
Child2Id = group.Key.Child2Id,
Child3 = group.Key.Child3 ?? "",
Child3Id = group.Key.Child3Id,
Child4 = group.Key.Child4 ?? "",
Child4Id = group.Key.Child4Id,
Male = group.Count(r => r.Gender == "Male"), // Count male entries
Female = group.Count(r => r.Gender == "Female"), // Count female entries
InsigniaId = group.Key.Id,
@ -1035,6 +1055,16 @@ namespace BMA.EHR.Application.Repositories.Reports
ProfileId = Guid.Parse("00000000-0000-0000-0000-000000000000"),
FullName = "",
Gender = "",
Root = "",
RootId = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
Child1 = "",
Child1Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
Child2 = "",
Child2Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
Child3 = "",
Child3Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
Child4 = "",
Child4Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
Male = 0,
Female = 0,
InsigniaId = ins.InsigniaId,