แก้ยืมคืนไม่ต้องเลือกหน่วยงาน

This commit is contained in:
Kittapath 2023-10-26 17:10:50 +07:00
parent 141902bfb3
commit f484ebdd1c

View file

@ -420,15 +420,21 @@ namespace BMA.EHR.Insignia.Service.Controllers
var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable() var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable()
.Include(x => x.RequestInsignia) .Include(x => x.RequestInsignia)
.Include(x => x.InsigniaNote) .Include(x => x.InsigniaNote)
.Include(x => x.Profile)
.FirstOrDefaultAsync(x => x.Id == req.InsigniaNoteProfileId); .FirstOrDefaultAsync(x => x.Id == req.InsigniaNoteProfileId);
if (insigniaNoteProfile == null) if (insigniaNoteProfile == null)
return Error(GlobalMessages.InsigniaRequestProfileNotFound); return Error(GlobalMessages.InsigniaRequestProfileNotFound);
if (insigniaNoteProfile.Status != "DONE") if (insigniaNoteProfile.Status != "DONE")
return Error(GlobalMessages.InsigniaNoBorrow); 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() var organization = await _context.Organizations.AsQueryable()
.Include(x => x.OrganizationOrganization) .Include(x => x.OrganizationOrganization)
.FirstOrDefaultAsync(x => x.Id == insigniaNoteProfile.Profile.OcId); .FirstOrDefaultAsync(x => x.Id == _organization.OrganizationAgencyId);
if (organization == null) if (organization == null)
return Error(GlobalMessages.OrganizationNotFound); return Error(GlobalMessages.OrganizationNotFound);