hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-03-27 15:21:56 +07:00
commit 775e72ba70
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Discipline.Service/Program.cs
View file

@ -154,7 +154,7 @@ var app = builder.Build();
app.UseStaticFiles();
app.MapControllers();
app.UseMiddleware<ErrorHandlerMiddleware>();
//app.UseMiddleware<RequestLoggingMiddleware>();
app.UseMiddleware<RequestLoggingMiddleware>();
app.UseHangfireDashboard("/hangfire", new DashboardOptions()
{

38
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -394,25 +394,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceased.Document = _doc;
}
retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
{
CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId,
Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix,
FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName,
LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName,
IsSendMail = true,
IsSendInbox = true,
IsSendNotification = true,
OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root,
PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
profileId = req.ProfileId,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
//retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
//{
// CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId,
// Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix,
// FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName,
// LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName,
// IsSendMail = true,
// IsSendInbox = true,
// IsSendNotification = true,
// OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root,
// PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
// profileId = req.ProfileId,
// CreatedFullName = FullName ?? "System Administrator",
// CreatedUserId = UserId ?? "",
// CreatedAt = DateTime.Now,
// LastUpdateFullName = FullName ?? "System Administrator",
// LastUpdateUserId = UserId ?? "",
// LastUpdatedAt = DateTime.Now,
//});
var pathUrl = $"{_configuration["API"]}/org/command/find-higher";
using (var client = new HttpClient())

2
BMA.EHR.Retirement.Service/Program.cs
View file

@ -161,7 +161,7 @@ var app = builder.Build();
app.UseStaticFiles();
app.MapControllers();
app.UseMiddleware<ErrorHandlerMiddleware>();
//app.UseMiddleware<RequestLoggingMiddleware>();
app.UseMiddleware<RequestLoggingMiddleware>();
app.UseHangfireDashboard("/hangfire", new DashboardOptions()
{