diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs index 6eb01ba6..5fef15c4 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs @@ -259,6 +259,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers Oc = x.Oc, Position = x.Position, LastUpdatedAt = x.LastUpdatedAt, + profileType = x.profileType, HistoryStatus = x.DisciplineComplaint_Appeal_Historys.Select(p => new { Status = p.Status, @@ -298,6 +299,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers _data.Oc, _data.Position, _data.LastUpdatedAt, + _data.profileType, _data.HistoryStatus, disciplineComplaint_Appeal_Docs, }; @@ -432,6 +434,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers ProfileId = req.ProfileId, Position = req.Position, Oc = req.Oc, + profileType = req.profileType, CreatedFullName = FullName ?? "System Administrator", CreatedUserId = UserId ?? "", CreatedAt = DateTime.Now, @@ -631,8 +634,10 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers CitizenId = x.CitizenId, ProfileId = x.ProfileId, LastUpdatedAt = x.LastUpdatedAt, + profileType = x.profileType }) - .OrderByDescending(x => x.LastUpdatedAt) + .OrderByDescending(x => x.profileType) + .ThenByDescending(x => x.LastUpdatedAt) .Skip((page - 1) * pageSize) .Take(pageSize) .ToList(); diff --git a/BMA.EHR.Discipline.Service/Requests/DisciplineComplaint_AppealRequest.cs b/BMA.EHR.Discipline.Service/Requests/DisciplineComplaint_AppealRequest.cs index e6f527f8..6d74adf4 100644 --- a/BMA.EHR.Discipline.Service/Requests/DisciplineComplaint_AppealRequest.cs +++ b/BMA.EHR.Discipline.Service/Requests/DisciplineComplaint_AppealRequest.cs @@ -15,6 +15,7 @@ namespace BMA.EHR.Discipline.Service.Requests public string? Fullname { get; set; } public string? Position { get; set; } public string? Oc { get; set; } + public string? profileType { get; set; } public List? File { get; set; } } }