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

test parent

Browse source
This commit is contained in:
kittapath 2025-10-12 16:51:51 +07:00
parent 84ab5e79d6
commit f97e643ac1
20 changed files with 155 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

90
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -285,7 +285,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
var endFiscalDate = new DateTime(year, 9, 30); var endFiscalDate = new DateTime(year, 9, 30);
rawData = rawData.Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate); rawData = rawData.Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate);
} }
//rawData = rawData.Where(x => x.LeaveStartDate.Year == year); //rawData = rawData.Where(x => x.LeaveStartDate.Year == year);
if (type != Guid.Empty) if (type != Guid.Empty)
rawData = rawData.Where(x => x.Type.Id == type); rawData = rawData.Where(x => x.Type.Id == type);
@ -366,7 +366,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
else if (role == "PARENT") else if (role == "PARENT")
{ {
rawData = rawData rawData = rawData
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)); .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -538,7 +538,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
else if (role == "PARENT") else if (role == "PARENT")
{ {
rawData = rawData rawData = rawData
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)); .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -573,7 +573,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
var toDay = data.LeaveStartDate.Date; var toDay = data.LeaveStartDate.Date;
var thisYear = data.LeaveStartDate.Year; var thisYear = data.LeaveStartDate.Year;
if(toDay >= new DateTime(thisYear,10,1) && toDay <= new DateTime(thisYear,12,31)) if (toDay >= new DateTime(thisYear, 10, 1) && toDay <= new DateTime(thisYear, 12, 31))
{ {
thisYear = thisYear + 1; thisYear = thisYear + 1;
} }
@ -645,7 +645,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
var toDay = rawData.LeaveStartDate.Date; var toDay = rawData.LeaveStartDate.Date;
var thisYear = rawData.LeaveStartDate.Year; var thisYear = rawData.LeaveStartDate.Year;
if(toDay >= new DateTime(thisYear,10,1) && toDay <= new DateTime(thisYear,12,31)) if (toDay >= new DateTime(thisYear, 10, 1) && toDay <= new DateTime(thisYear, 12, 31))
{ {
thisYear = thisYear + 1; thisYear = thisYear + 1;
} }
@ -1111,7 +1111,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
var toDay = rawData.LeaveStartDate.Date; var toDay = rawData.LeaveStartDate.Date;
var thisYear = rawData.LeaveStartDate.Year; var thisYear = rawData.LeaveStartDate.Year;
if(toDay >= new DateTime(thisYear,10,1) && toDay <= new DateTime(thisYear,12,31)) if (toDay >= new DateTime(thisYear, 10, 1) && toDay <= new DateTime(thisYear, 12, 31))
{ {
thisYear = thisYear + 1; thisYear = thisYear + 1;
} }
@ -1529,7 +1529,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
} }
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data.Where(x => x.Child1DnaId == Guid.Parse(nodeId)).ToList(); data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -1568,46 +1568,46 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
from grp in grouped from grp in grouped
orderby grp.Key orderby grp.Key
select new GetSumApproveLeaveByRootDto select new GetSumApproveLeaveByRootDto
{ {
//Root = $"{grp.Key.Root}{(!string.IsNullOrEmpty(grp.Key.Child1) ? "/" + grp.Key.Child1 : "")}{(!string.IsNullOrEmpty(grp.Key.Child2) ? "/" + grp.Key.Child2 : "")}{(!string.IsNullOrEmpty(grp.Key.Child3) ? "/" + grp.Key.Child3 : "")}{(!string.IsNullOrEmpty(grp.Key.Child4) ? "/" + grp.Key.Child4 : "")}", //Root = $"{grp.Key.Root}{(!string.IsNullOrEmpty(grp.Key.Child1) ? "/" + grp.Key.Child1 : "")}{(!string.IsNullOrEmpty(grp.Key.Child2) ? "/" + grp.Key.Child2 : "")}{(!string.IsNullOrEmpty(grp.Key.Child3) ? "/" + grp.Key.Child3 : "")}{(!string.IsNullOrEmpty(grp.Key.Child4) ? "/" + grp.Key.Child4 : "")}",
Root = organizationName, Root = organizationName,
SumLeaveDay = grp.Sum(x => x.LeaveTotal), SumLeaveDay = grp.Sum(x => x.LeaveTotal),
sickDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-001").Sum(x => x.LeaveTotal), sickDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-001").Sum(x => x.LeaveTotal),
maternityDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-002").Sum(x => x.LeaveTotal), maternityDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-002").Sum(x => x.LeaveTotal),
wifeDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-003").Sum(x => x.LeaveTotal), wifeDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-003").Sum(x => x.LeaveTotal),
personalDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-004").Sum(x => x.LeaveTotal), personalDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-004").Sum(x => x.LeaveTotal),
restDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-005").Sum(x => x.LeaveTotal), restDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-005").Sum(x => x.LeaveTotal),
ordainDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-006").Sum(x => x.LeaveTotal), ordainDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-006").Sum(x => x.LeaveTotal),
absentDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-007").Sum(x => x.LeaveTotal), absentDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-007").Sum(x => x.LeaveTotal),
studyDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-008").Sum(x => x.LeaveTotal), studyDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-008").Sum(x => x.LeaveTotal),
agencyDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-009").Sum(x => x.LeaveTotal), agencyDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-009").Sum(x => x.LeaveTotal),
coupleDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-010").Sum(x => x.LeaveTotal), coupleDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-010").Sum(x => x.LeaveTotal),
therapyDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-011").Sum(x => x.LeaveTotal), therapyDayCountMale = grp.Where(x => x.Gender == "ชาย" && x.LeaveTypeCode == "LV-011").Sum(x => x.LeaveTotal),
sickDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-001").Sum(x => x.LeaveTotal), sickDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-001").Sum(x => x.LeaveTotal),
maternityDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-002").Sum(x => x.LeaveTotal), maternityDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-002").Sum(x => x.LeaveTotal),
wifeDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-003").Sum(x => x.LeaveTotal), wifeDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-003").Sum(x => x.LeaveTotal),
personalDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-004").Sum(x => x.LeaveTotal), personalDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-004").Sum(x => x.LeaveTotal),
restDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-005").Sum(x => x.LeaveTotal), restDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-005").Sum(x => x.LeaveTotal),
ordainDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-006").Sum(x => x.LeaveTotal), ordainDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-006").Sum(x => x.LeaveTotal),
absentDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-007").Sum(x => x.LeaveTotal), absentDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-007").Sum(x => x.LeaveTotal),
studyDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-008").Sum(x => x.LeaveTotal), studyDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-008").Sum(x => x.LeaveTotal),
agencyDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-009").Sum(x => x.LeaveTotal), agencyDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-009").Sum(x => x.LeaveTotal),
coupleDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-010").Sum(x => x.LeaveTotal), coupleDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-010").Sum(x => x.LeaveTotal),
therapyDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-011").Sum(x => x.LeaveTotal), therapyDayCountFemale = grp.Where(x => x.Gender == "หญิง" && x.LeaveTypeCode == "LV-011").Sum(x => x.LeaveTotal),
sickDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-001").Sum(x => x.LeaveTotal), sickDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-001").Sum(x => x.LeaveTotal),
maternityDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-002").Sum(x => x.LeaveTotal), maternityDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-002").Sum(x => x.LeaveTotal),
wifeDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-003").Sum(x => x.LeaveTotal), wifeDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-003").Sum(x => x.LeaveTotal),
personalDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-004").Sum(x => x.LeaveTotal), personalDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-004").Sum(x => x.LeaveTotal),
restDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-005").Sum(x => x.LeaveTotal), restDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-005").Sum(x => x.LeaveTotal),
ordainDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-006").Sum(x => x.LeaveTotal), ordainDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-006").Sum(x => x.LeaveTotal),
absentDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-007").Sum(x => x.LeaveTotal), absentDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-007").Sum(x => x.LeaveTotal),
studyDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-008").Sum(x => x.LeaveTotal), studyDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-008").Sum(x => x.LeaveTotal),
agencyDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-009").Sum(x => x.LeaveTotal), agencyDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-009").Sum(x => x.LeaveTotal),
coupleDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-010").Sum(x => x.LeaveTotal), coupleDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-010").Sum(x => x.LeaveTotal),
therapyDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-011").Sum(x => x.LeaveTotal), therapyDayCountNo = grp.Where(x => x.Gender != "ชาย" && x.Gender != "หญิง" && x.LeaveTypeCode == "LV-011").Sum(x => x.LeaveTotal),
}) })
.ToList(); .ToList();
return res; return res;

2
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs
View file

@ -168,7 +168,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data data = data
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

4
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
View file

@ -164,7 +164,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
} }
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data.Where(x => x.Child1DnaId == Guid.Parse(nodeId)).ToList(); data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -274,7 +274,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data data = data
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)) .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
.ToList(); .ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")

2
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs
View file

@ -133,7 +133,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data data = data
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)) .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
.ToList(); .ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")

120
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
View file

@ -772,14 +772,10 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" || role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var data_search = (from x in _context.DisciplineComplaint_Appeals var data_search = (from x in _context.DisciplineComplaint_Appeals
@ -814,7 +810,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
data_search = data_search data_search = data_search
.Where(x => x.child1DnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -838,74 +834,74 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
LastUpdatedAt = x.LastUpdatedAt, LastUpdatedAt = x.LastUpdatedAt,
profileType = x.profileType profileType = x.profileType
}); });
bool desc = descending ?? false; bool desc = descending ?? false;
if (!string.IsNullOrEmpty(sortBy)) if (!string.IsNullOrEmpty(sortBy))
{ {
switch (sortBy) switch (sortBy)
{ {
case "title": case "title":
query = desc ? query.OrderByDescending(x => x.Title) query = desc ? query.OrderByDescending(x => x.Title)
: query.OrderBy(x => x.Title); : query.OrderBy(x => x.Title);
break; break;
case "description": case "description":
query = desc ? query.OrderByDescending(x => x.Description) query = desc ? query.OrderByDescending(x => x.Description)
: query.OrderBy(x => x.Description); : query.OrderBy(x => x.Description);
break; break;
case "status": case "status":
query = desc ? query.OrderByDescending(x => x.Status) query = desc ? query.OrderByDescending(x => x.Status)
: query.OrderBy(x => x.Status); : query.OrderBy(x => x.Status);
break; break;
case "type": case "type":
query = desc ? query.OrderByDescending(x => x.Type) query = desc ? query.OrderByDescending(x => x.Type)
: query.OrderBy(x => x.Type); : query.OrderBy(x => x.Type);
break; break;
case "year": case "year":
query = desc ? query.OrderByDescending(x => x.Year) query = desc ? query.OrderByDescending(x => x.Year)
: query.OrderBy(x => x.Year); : query.OrderBy(x => x.Year);
break; break;
case "caseType": case "caseType":
query = desc ? query.OrderByDescending(x => x.CaseType) query = desc ? query.OrderByDescending(x => x.CaseType)
: query.OrderBy(x => x.CaseType); : query.OrderBy(x => x.CaseType);
break; break;
case "caseNumber": case "caseNumber":
query = desc ? query.OrderByDescending(x => x.CaseNumber) query = desc ? query.OrderByDescending(x => x.CaseNumber)
: query.OrderBy(x => x.CaseNumber); : query.OrderBy(x => x.CaseNumber);
break; break;
case "fullname": case "fullname":
query = desc ? query.OrderByDescending(x => x.Fullname) query = desc ? query.OrderByDescending(x => x.Fullname)
: query.OrderBy(x => x.Fullname); : query.OrderBy(x => x.Fullname);
break; break;
case "lastUpdatedAt": case "lastUpdatedAt":
query = desc ? query.OrderByDescending(x => x.LastUpdatedAt) query = desc ? query.OrderByDescending(x => x.LastUpdatedAt)
: query.OrderBy(x => x.LastUpdatedAt); : query.OrderBy(x => x.LastUpdatedAt);
break; break;
case "profileType": case "profileType":
query = desc ? query.OrderByDescending(x => x.profileType) query = desc ? query.OrderByDescending(x => x.profileType)
: query.OrderBy(x => x.profileType); : query.OrderBy(x => x.profileType);
break; break;
default: default:
query = query query = query
.OrderByDescending(x => x.profileType) .OrderByDescending(x => x.profileType)
.ThenByDescending(x => x.LastUpdatedAt); .ThenByDescending(x => x.LastUpdatedAt);
break; break;
} }
} }
var data = query var data = query
.Skip((page - 1) * pageSize) .Skip((page - 1) * pageSize)
.Take(pageSize) .Take(pageSize)
.ToList(); .ToList();
return Success(new { data, total = data_search.Count() }); return Success(new { data, total = data_search.Count() });
} }

16
BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
View file

@ -623,14 +623,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
@ -710,7 +706,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
rawData = rawData rawData = rawData
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -908,14 +904,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" || role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
@ -993,7 +985,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
rawData = rawData rawData = rawData
.Where(x => x.Child1DnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

20
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -1296,14 +1296,10 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
//var data = (await _userTimeStampRepository.GetTimeStampHistoryForAdminAsync(startDate, endDate)) //var data = (await _userTimeStampRepository.GetTimeStampHistoryForAdminAsync(startDate, endDate))
var data = (await _userTimeStampRepository.GetTimeStampHistoryForAdminRoleAsync(startDate, endDate, role, nodeId, profileAdmin?.Node)) var data = (await _userTimeStampRepository.GetTimeStampHistoryForAdminRoleAsync(startDate, endDate, role, nodeId, profileAdmin?.Node))
@ -1596,14 +1592,11 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
//var resultData = await _processUserTimeStampRepository.GetTimeStampHistoryForAdminAsync(startDate, endDate); //var resultData = await _processUserTimeStampRepository.GetTimeStampHistoryForAdminAsync(startDate, endDate);
var resultData = await _processUserTimeStampRepository.GetTimeStampHistoryForAdminRoleAsync(startDate, endDate, role, nodeId, profileAdmin?.Node); var resultData = await _processUserTimeStampRepository.GetTimeStampHistoryForAdminRoleAsync(startDate, endDate, role, nodeId, profileAdmin?.Node);
var data = new List<CheckInProcessHistoryForAdminDto>(); var data = new List<CheckInProcessHistoryForAdminDto>();
@ -2436,14 +2429,11 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
//var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequests(year, month); //var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequests(year, month);
var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequestsByAdminRole(year, month, role, nodeId, profileAdmin?.Node); var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequestsByAdminRole(year, month, role, nodeId, profileAdmin?.Node);

32
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -918,14 +918,10 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
if (type.Trim().ToUpper() == "OFFICER") if (type.Trim().ToUpper() == "OFFICER")
{ {
@ -1539,14 +1535,10 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
if (type.Trim().ToUpper() == "OFFICER") if (type.Trim().ToUpper() == "OFFICER")
{ {
@ -1869,14 +1861,10 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
if (type.Trim().ToUpper() == "OFFICER") if (type.Trim().ToUpper() == "OFFICER")
{ {
@ -2279,14 +2267,11 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var userTimeStamps = await _processUserTimeStampRepository.GetTimestampByDateLateAsync(type.Trim().ToUpper(), role, nodeId, profileAdmin.Node, req.nodeId, req.node, req.StartDate, req.EndDate); var userTimeStamps = await _processUserTimeStampRepository.GetTimestampByDateLateAsync(type.Trim().ToUpper(), role, nodeId, profileAdmin.Node, req.nodeId, req.node, req.StartDate, req.EndDate);
foreach (var p in userTimeStamps) foreach (var p in userTimeStamps)
{ {
@ -2391,14 +2376,11 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type, jsonData["result"]?.ToString(), nodeId, profileAdmin?.Node, req.nodeId, req.node); var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type, jsonData["result"]?.ToString(), nodeId, profileAdmin?.Node, req.nodeId, req.node);
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}"; var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}";
var result = new var result = new

12
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1635,14 +1635,10 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var rawData = await _leaveRequestRepository.GetListLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, role, nodeId, profileAdmin?.Node); var rawData = await _leaveRequestRepository.GetListLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, role, nodeId, profileAdmin?.Node);
@ -1824,14 +1820,10 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var rawData = var rawData =
await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node); await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node);

8
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -99,14 +99,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var placementAppointments = await _context.PlacementAppointments.AsQueryable() var placementAppointments = await _context.PlacementAppointments.AsQueryable()
@ -228,7 +224,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
placementAppointments = placementAppointments placementAppointments = placementAppointments
.Where(x => x.child1DnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -98,14 +98,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var placementAppointments = await _context.PlacementAppointments.AsQueryable() var placementAppointments = await _context.PlacementAppointments.AsQueryable()
@ -222,7 +218,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
placementAppointments = placementAppointments placementAppointments = placementAppointments
.Where(x => x.child1DnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -99,14 +99,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var placementOfficers = await _context.PlacementOfficers.AsQueryable() var placementOfficers = await _context.PlacementOfficers.AsQueryable()
@ -183,7 +179,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
placementOfficers = placementOfficers placementOfficers = placementOfficers
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -100,14 +100,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var placementReceives = await _context.PlacementReceives.AsQueryable() var placementReceives = await _context.PlacementReceives.AsQueryable()
@ -221,7 +217,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
placementReceives = placementReceives placementReceives = placementReceives
.Where(x => (x.child1DnaId == nodeId) || (x.CreatedUserId == UserId)).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -100,14 +100,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var placementRepatriations = await _context.PlacementRepatriations.AsQueryable() var placementRepatriations = await _context.PlacementRepatriations.AsQueryable()
@ -188,7 +184,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
placementRepatriations = placementRepatriations placementRepatriations = placementRepatriations
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -192,14 +192,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var placementTransfers = await _context.PlacementTransfers.AsQueryable() var placementTransfers = await _context.PlacementTransfers.AsQueryable()
@ -274,7 +270,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
placementTransfers = placementTransfers placementTransfers = placementTransfers
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -104,14 +104,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementDeceaseds = await _context.RetirementDeceaseds.AsQueryable() var retirementDeceaseds = await _context.RetirementDeceaseds.AsQueryable()
@ -167,7 +163,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementDeceaseds = retirementDeceaseds retirementDeceaseds = retirementDeceaseds
.Where(x => x.child1DnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -100,14 +100,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementOthers = await _context.RetirementOthers.AsQueryable() var retirementOthers = await _context.RetirementOthers.AsQueryable()
@ -217,7 +213,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementOthers = retirementOthers retirementOthers = retirementOthers
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

8
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -115,14 +115,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementOuts = await _context.RetirementOuts.AsQueryable() var retirementOuts = await _context.RetirementOuts.AsQueryable()
@ -198,7 +194,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementOuts = retirementOuts retirementOuts = retirementOuts
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

24
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -257,14 +257,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementResigns = await _context.RetirementResigns.AsQueryable() var retirementResigns = await _context.RetirementResigns.AsQueryable()
@ -324,7 +320,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementResigns = retirementResigns retirementResigns = retirementResigns
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -370,14 +366,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementResigns = await _context.RetirementResignCancels.AsQueryable() var retirementResigns = await _context.RetirementResignCancels.AsQueryable()
@ -436,7 +428,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementResigns = retirementResigns retirementResigns = retirementResigns
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -2145,14 +2137,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var data = await _context.RetirementQuestions.AsQueryable() var data = await _context.RetirementQuestions.AsQueryable()
@ -2205,7 +2193,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data data = data
.Where(x => x.child1DnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {

25
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -196,14 +196,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementResignEmployees = await _context.RetirementResignEmployees.AsQueryable() var retirementResignEmployees = await _context.RetirementResignEmployees.AsQueryable()
@ -263,7 +259,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementResignEmployees = retirementResignEmployees retirementResignEmployees = retirementResignEmployees
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -309,15 +305,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var retirementResignEmployees = await _context.RetirementResignEmployeeCancels.AsQueryable() var retirementResignEmployees = await _context.RetirementResignEmployeeCancels.AsQueryable()
@ -375,7 +366,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
retirementResignEmployees = retirementResignEmployees retirementResignEmployees = retirementResignEmployees
.Where(x => x.child1DnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
@ -2062,14 +2053,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT") else if (role == "ROOT" && role == "PARENT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node; var node = profileAdmin?.Node;
var data = await _context.RetirementEmployeeQuestions.AsQueryable() var data = await _context.RetirementEmployeeQuestions.AsQueryable()
@ -2122,7 +2109,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT") else if (role == "PARENT")
{ {
data = data data = data
.Where(x => x.child1DnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {