From 560cdae2099274c5f53a452ff01ae6071d1cb0d4 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 12 Nov 2024 10:53:38 +0700 Subject: [PATCH] no message --- .../Repositories/Reports/InsigniaReportRepository.cs | 2 +- .../Controllers/PlacementController.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index e44448f9..7e14c388 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -998,7 +998,7 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync(); foreach (var insigniaPeriod in insigniaPeriods) { - if (insigniaPeriod.EndDate.Date.AddDays(5) == DateTime.Now.Date) + if (insigniaPeriod.EndDate.Date.AddDays(5) < DateTime.Now.Date) continue; insigniaPeriod.IsLock = true; var insigniaNote = await _dbContext.Set() diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index eead4006..a337a157 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -719,10 +719,10 @@ namespace BMA.EHR.Placement.Service.Controllers .Include(x => x.OrganizationPosition) .Include(x => x.PositionNumber) .Include(x => x.PositionPath) - .Include(x => x.PositionLevel) + // .Include(x => x.PositionLevel) .Include(x => x.PositionLine) .Include(x => x.PositionPathSide) - .Include(x => x.PositionType) + // .Include(x => x.PositionType) .FirstOrDefaultAsync(x => x.Id == req.PersonalId); if (person == null) return Error(GlobalMessages.DataNotFound, 404); @@ -1246,10 +1246,10 @@ namespace BMA.EHR.Placement.Service.Controllers .Include(x => x.OrganizationPosition) .Include(x => x.PositionNumber) .Include(x => x.PositionPath) - .Include(x => x.PositionLevel) + // .Include(x => x.PositionLevel) .Include(x => x.PositionLine) .Include(x => x.PositionPathSide) - .Include(x => x.PositionType) + // .Include(x => x.PositionType) .FirstOrDefaultAsync(x => x.Id == personalId); if (profile == null) return Error(GlobalMessages.DataNotFound, 404);