From 679cc2cfc245e52996780985b44d0f5b26dd86ea Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 15 Sep 2023 22:04:48 +0700 Subject: [PATCH] no message --- .../Repositories/Reports/InsigniaReportRepository.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index d4c2fb92..256056a0 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -175,6 +175,7 @@ namespace BMA.EHR.Application.Repositories.Reports .Include(x => x.Profile) .Where(x => x.Request.Period == period) .Where(x => x.IsApprove == true) + .Where(x => x.Status == "PENDING") .Where(x => x.RequestInsignia.InsigniaType != null) .Where(x => x.RequestInsignia.InsigniaType.Name == "ชั้นสายสะพาย") .Select(x => new @@ -218,6 +219,7 @@ namespace BMA.EHR.Application.Repositories.Reports .Include(x => x.Profile) .Where(x => x.Request.Period == period) .Where(x => x.IsApprove == true) + .Where(x => x.Status == "PENDING") .Where(x => x.RequestInsignia.InsigniaType != null) .Where(x => x.RequestInsignia.InsigniaType.Name == "ชั้นสายสะพาย") .Select(x => new @@ -275,6 +277,7 @@ namespace BMA.EHR.Application.Repositories.Reports .Include(x => x.Profile) .Where(x => x.Request.Period == period) .Where(x => x.IsApprove == true) + .Where(x => x.Status == "PENDING") .Where(x => x.RequestInsignia.InsigniaType != null) .Where(x => x.RequestInsignia.InsigniaType.Name == "ชั้นต่ำกว่าสายสะพาย") .Select(x => new @@ -325,6 +328,7 @@ namespace BMA.EHR.Application.Repositories.Reports .Include(x => x.Profile) .Where(x => x.Request.Period == period) .Where(x => x.IsApprove == true) + .Where(x => x.Status == "PENDING") .Where(x => x.RequestInsignia.InsigniaType != null) .Where(x => x.RequestInsignia.InsigniaType.Name == "ชั้นต่ำกว่าสายสะพาย") .Select(x => new @@ -408,6 +412,7 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync() where r.Request.Period == period && r.IsApprove == true + && r.Status == "PENDING" && r.RequestInsignia.InsigniaType != null && r.RequestInsignia.InsigniaType.Name != "เหรียญบำเหน็จในราชการ" select new @@ -509,6 +514,7 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync() where r.Request.Period == period && r.IsApprove == true + && r.Status == "PENDING" && r.RequestInsignia.InsigniaType != null && r.RequestInsignia.InsigniaType.Name != "เหรียญบำเหน็จในราชการ" select new @@ -628,6 +634,7 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync() where r.Request.Period == period && r.IsApprove == true + && r.Status == "PENDING" && r.RequestInsignia.InsigniaType != null && r.RequestInsignia.InsigniaType.Name != "เหรียญบำเหน็จในราชการ" select new @@ -673,6 +680,7 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync() where r.Request.Period == period && r.IsApprove == true + && r.Status == "PENDING" && r.RequestInsignia.InsigniaType != null && r.RequestInsignia.InsigniaType.Name != "เหรียญบำเหน็จในราชการ" select new @@ -719,6 +727,7 @@ namespace BMA.EHR.Application.Repositories.Reports .Include(x => x.Profile) .Where(x => x.Request.Period == period) .Where(x => x.IsApprove == true) + .Where(x => x.Status == "PENDING") .Where(x => x.RequestInsignia.InsigniaType != null) .Where(x => x.RequestInsignia.InsigniaType.Name == "เหรียญบำเหน็จในราชการ") .Select(x => new @@ -755,6 +764,7 @@ namespace BMA.EHR.Application.Repositories.Reports .Include(x => x.Profile) .Where(x => x.Request.Period == period) .Where(x => x.IsApprove == true) + .Where(x => x.Status == "PENDING") .Where(x => x.RequestInsignia.InsigniaType != null) .Where(x => x.RequestInsignia.InsigniaType.Name == "เหรียญบำเหน็จในราชการ") .Select(x => new @@ -810,6 +820,7 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync() where r.Request.Period == period && r.IsApprove == true + && r.Status == "PENDING" && r.RequestInsignia.InsigniaType != null && r.RequestInsignia.InsigniaType.Name != "เหรียญบำเหน็จในราชการ" select new