From f484ebdd1c89f5e5b76156d4724fb42bfcbb06bd Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 26 Oct 2023 17:10:50 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A2=E0=B8=B7?= =?UTF-8?q?=E0=B8=A1=E0=B8=84=E0=B8=B7=E0=B8=99=E0=B9=84=E0=B8=A1=E0=B9=88?= =?UTF-8?q?=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=A5=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InsigniaManageController.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs index d7ce8714..d5aa7eac 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs @@ -420,15 +420,21 @@ namespace BMA.EHR.Insignia.Service.Controllers var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable() .Include(x => x.RequestInsignia) .Include(x => x.InsigniaNote) + .Include(x => x.Profile) .FirstOrDefaultAsync(x => x.Id == req.InsigniaNoteProfileId); if (insigniaNoteProfile == null) return Error(GlobalMessages.InsigniaRequestProfileNotFound); if (insigniaNoteProfile.Status != "DONE") return Error(GlobalMessages.InsigniaNoBorrow); + var _organization = await _context.Organizations.AsQueryable() + .FirstOrDefaultAsync(x => x.Id == insigniaNoteProfile.Profile.OcId); + if (_organization == null) + return Error(GlobalMessages.OrganizationNotFound); + var organization = await _context.Organizations.AsQueryable() .Include(x => x.OrganizationOrganization) - .FirstOrDefaultAsync(x => x.Id == insigniaNoteProfile.Profile.OcId); + .FirstOrDefaultAsync(x => x.Id == _organization.OrganizationAgencyId); if (organization == null) return Error(GlobalMessages.OrganizationNotFound);