From 5ea471d8f29ac2889ad4339768a923bed322960a Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 29 Sep 2023 20:44:58 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20id=20noti=20insig?= =?UTF-8?q?nia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InsigniaRequestController.cs | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs index ee8c6c62..f449d4d6 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs @@ -435,7 +435,7 @@ namespace BMA.EHR.Insignia.Service.Controllers Document = result.Document, Items = new List() }; - if (RoleAdmin == true && result.RequestStatus != "st5") + if (RoleAdmin == true && result.RequestStatus != "st6") return Success(resend); if (RoleInsignia2 == true && (result.RequestStatus == "st1" || result.RequestStatus == "st2")) return Success(resend); @@ -669,15 +669,19 @@ namespace BMA.EHR.Insignia.Service.Controllers { await _repository.SaveAprove(id, ocId); var requestId = await _repository.GetRequestId(id, ocId); - var requestNew = await _context.InsigniaRequests.FirstOrDefaultAsync(i => i.Id == requestId); + var requestNew = await _context.InsigniaRequests + .Include(x => x.Organization) + .ThenInclude(x => x.OrganizationOrganization) + .Include(x => x.Period) + .FirstOrDefaultAsync(i => i.Id == requestId); if (requestNew != null) { requestNew.RequestStatus = "st3"; requestNew.RequestNote = ""; await _repositoryNoti.PushNotificationAsync( Guid.Parse("08db721d-ae15-40a2-8331-3e2e6d9d9a86"), - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", "", true ); @@ -725,22 +729,26 @@ namespace BMA.EHR.Insignia.Service.Controllers public async Task> ApproveChangeStatusToSt6(Guid id, Guid ocId) { var requestId = await _repository.GetRequestId(id, ocId); - var requestNew = await _context.InsigniaRequests.FirstOrDefaultAsync(i => i.Id == requestId); + var requestNew = await _context.InsigniaRequests + .Include(x => x.Organization) + .ThenInclude(x => x.OrganizationOrganization) + .Include(x => x.Period) + .FirstOrDefaultAsync(i => i.Id == requestId); if (requestNew != null) { requestNew.RequestStatus = "st6"; requestNew.RequestNote = ""; await _repositoryNoti.PushNotificationAsync( Guid.Parse("08db721d-ada0-4e64-89d3-7584a893d8b8"), - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", "", true ); await _repositoryNoti.PushNotificationAsync( - Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e658"), - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e65"), + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", "", true ); @@ -934,7 +942,7 @@ namespace BMA.EHR.Insignia.Service.Controllers .ToListAsync(); var allUserUser = await _context.InsigniaRequests .Where(x => x.Period == insigniaPeriod) - .Where(x => RoleAdmin == true ? x.RequestStatus == "st5" : (RoleInsignia2 == true ? (x.RequestStatus == "st3" || x.RequestStatus == "st4") : x.Id != null)) + .Where(x => RoleAdmin == true ? x.RequestStatus == "st6" : (RoleInsignia2 == true ? (x.RequestStatus != "st1" && x.RequestStatus != "st2") : x.Id != null)) .Select(x => x.RequestProfiles.Count(x => x.Status != "DELETE" && x.Status != "REJECT")) .SumAsync(); @@ -1155,7 +1163,7 @@ namespace BMA.EHR.Insignia.Service.Controllers } var requestOlds = await _context.InsigniaRequests .Where(p => p.Period == insigniaPeriod) - .Where(p => p.RequestStatus == "st5") + .Where(p => p.RequestStatus == "st6") .ToListAsync(); foreach (var requestOld in requestOlds) {