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

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-03-27 15:21:56 +07:00
commit 52b4745f91
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.UseStaticFiles();
app.MapControllers(); app.MapControllers();
app.UseMiddleware<ErrorHandlerMiddleware>(); app.UseMiddleware<ErrorHandlerMiddleware>();
//app.UseMiddleware<RequestLoggingMiddleware>(); app.UseMiddleware<RequestLoggingMiddleware>();
app.UseHangfireDashboard("/hangfire", new DashboardOptions() 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.Document = _doc;
} }
retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti //retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
{ //{
CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId, // CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId,
Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix, // Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix,
FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName, // FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName,
LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName, // LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName,
IsSendMail = true, // IsSendMail = true,
IsSendInbox = true, // IsSendInbox = true,
IsSendNotification = true, // IsSendNotification = true,
OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root, // OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root,
PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position, // PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
profileId = req.ProfileId, // profileId = req.ProfileId,
CreatedFullName = FullName ?? "System Administrator", // CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "", // CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now, // CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator", // LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "", // LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now, // LastUpdatedAt = DateTime.Now,
}); //});
var pathUrl = $"{_configuration["API"]}/org/command/find-higher"; var pathUrl = $"{_configuration["API"]}/org/command/find-higher";
using (var client = new HttpClient()) 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.UseStaticFiles();
app.MapControllers(); app.MapControllers();
app.UseMiddleware<ErrorHandlerMiddleware>(); app.UseMiddleware<ErrorHandlerMiddleware>();
//app.UseMiddleware<RequestLoggingMiddleware>(); app.UseMiddleware<RequestLoggingMiddleware>();
app.UseHangfireDashboard("/hangfire", new DashboardOptions() app.UseHangfireDashboard("/hangfire", new DashboardOptions()
{ {