Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2023-09-21 09:30:10 +07:00
commit 122fe5be90

View file

@ -911,7 +911,7 @@ namespace BMA.EHR.Application.Repositories.Reports
.ToListAsync();
foreach (var insigniaPeriod in insigniaPeriods)
{
if (insigniaPeriod.StartDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date)
if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date)
{
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"),
@ -920,6 +920,13 @@ namespace BMA.EHR.Application.Repositories.Reports
"",
true
);
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"),
$"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}",
$"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}",
"",
true
);
}
}
}