test parent
This commit is contained in:
parent
84ab5e79d6
commit
f97e643ac1
20 changed files with 155 additions and 264 deletions
|
|
@ -623,14 +623,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT")
|
||||
else if (role == "ROOT" && role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.Child1DnaId;
|
||||
}
|
||||
|
||||
var node = profileAdmin?.Node;
|
||||
|
||||
|
|
@ -710,7 +706,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
else if (role == "PARENT")
|
||||
{
|
||||
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")
|
||||
{
|
||||
|
|
@ -908,14 +904,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT")
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.Child1DnaId;
|
||||
}
|
||||
|
||||
var node = profileAdmin?.Node;
|
||||
|
||||
|
|
@ -993,7 +985,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
else if (role == "PARENT")
|
||||
{
|
||||
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")
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue