fix bug ระบบวินัย เมนูสอบสวน-สรุปผล ไม่ได้กรองสิทธิ์ #7

BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs

@@ -889,6 +889,10 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                 RespondentType = data.RespondentType.Trim().ToUpper(),
                 Organization = data.Organization,
                 RootDnaId = data.RootDnaId,
+                Child1DnaId = data.Child1DnaId,
+                Child2DnaId = data.Child2DnaId,
+                Child3DnaId = data.Child3DnaId,
+                Child4DnaId = data.Child4DnaId,
                 ConsideredAgency = data.ConsideredAgency,
                 OrganizationId = data.OrganizationId,
                 ConsideredAgencyId = data.ConsideredAgencyId,

BMA.EHR.Discipline.Service/Program.cs

@@ -121,7 +121,7 @@ var builder = WebApplication.CreateBuilder(args);
                     DashboardJobListLimit = 50000,
                     TransactionTimeout = TimeSpan.FromMinutes(1),
                     InvisibilityTimeout = TimeSpan.FromHours(3),
-                    TablesPrefix = "Hangfire"
+                    TablesPrefix = "Hangfire_Discipline"
                 })));
     builder.Services.AddHangfireServer();
 }

BMA.EHR.Leave/Services/NotificationService.cs

@@ -11,15 +11,22 @@ public class NotificationService
     private readonly ILogger<NotificationService> _logger;
     private readonly IConfiguration _configuration;
 
-    private const string NotifyEndpoint = "https://hrmsbkk.case-collection.com/api/v1/org/through-socket/notify-from-token";
+    private string _notifyEndpoint;
 
     public NotificationService(IHttpClientFactory httpClientFactory, ILogger<NotificationService> logger, IConfiguration configuration)
     {
         _httpClientFactory = httpClientFactory;
         _logger = logger;
         _configuration = configuration;
+        _notifyEndpoint = $"{_configuration["API"]}/org/through-socket/notify-from-token";
     }
 
+    /// <summary>
+    /// SendNotificationAsync
+    /// </summary>
+    /// <param name="token"></param>
+    /// <param name="error"></param>
+    /// <param name="message"></param>
     public async Task SendNotificationAsync(string? token, bool error, string message)
     {
         if (string.IsNullOrEmpty(token))
@@ -42,7 +49,7 @@ public class NotificationService
             var json = JsonConvert.SerializeObject(payload);
             var content = new StringContent(json, Encoding.UTF8, "application/json");
 
-            var response = await client.PostAsync(NotifyEndpoint, content);
+            var response = await client.PostAsync(_notifyEndpoint, content);
 
             if (!response.IsSuccessStatusCode)
             {

BMA.EHR.Placement.Service/Program.cs

@@ -121,7 +121,7 @@ var builder = WebApplication.CreateBuilder(args);
                     PrepareSchemaIfNecessary = true,
                     DashboardJobListLimit = 50000,
                     TransactionTimeout = TimeSpan.FromMinutes(1),
-                    TablesPrefix = "Hangfire"
+                    TablesPrefix = "Hangfire_Placement"
                 })));
     builder.Services.AddHangfireServer();
 }

BMA.EHR.Retirement.Service/Program.cs

@@ -130,7 +130,7 @@ var builder = WebApplication.CreateBuilder(args);
                     DashboardJobListLimit = 50000,
                     TransactionTimeout = TimeSpan.FromMinutes(1),
                     InvisibilityTimeout = TimeSpan.FromHours(3),
-                    TablesPrefix = "Hangfire"
+                    TablesPrefix = "Hangfire_Retirement"
                 })));
     builder.Services.AddHealthChecks();
 }