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

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

@ -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")
{ {

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")

8
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")
{ {

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")
{ {