no message
This commit is contained in:
parent
6713ec6cf0
commit
ae67d4381d
8 changed files with 70 additions and 135 deletions
|
|
@ -58,9 +58,6 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
|
||||
private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
|
||||
|
||||
//private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1");
|
||||
private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value));
|
||||
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -182,28 +179,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.profileId,
|
||||
})
|
||||
.ToListAsync();
|
||||
// if (PlacementAdmin == true)
|
||||
// placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING"));
|
||||
|
||||
// if (keyword != "")
|
||||
// {
|
||||
// var data = placementReceives.Where(x =>
|
||||
// (x.prefix != null && x.prefix.Contains(keyword)) ||
|
||||
// (x.firstName != null && x.firstName.Contains(keyword)) ||
|
||||
// (x.lastName != null && x.lastName.Contains(keyword)) ||
|
||||
// (x.citizenId != null && x.citizenId.Contains(keyword)) ||
|
||||
// (x.root != null && x.root.Contains(keyword)) ||
|
||||
// (x.nodeName != null && x.nodeName.Contains(keyword)) ||
|
||||
// (x.nodeShortName != null && x.nodeShortName.Contains(keyword)))
|
||||
// .OrderByDescending(x => x.CreatedAt)
|
||||
// .Skip((page - 1) * pageSize)
|
||||
// .Take(pageSize)
|
||||
// .ToList();
|
||||
|
||||
// placementReceives = data;
|
||||
// }
|
||||
return Success(placementReceives);
|
||||
// }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -999,7 +975,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
{
|
||||
result.Add(r);
|
||||
string? _null = null;
|
||||
result.Add(new {
|
||||
result.Add(new
|
||||
{
|
||||
No = _null,
|
||||
FullName = r.RemarkHorizontal,
|
||||
Education = _null,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue