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

BMA.EHR.Application/Responses/Profiles/GetUserOCIdDto.cs

@@ -22,6 +22,10 @@
 
         public Guid RootId { get; set; }
         public Guid? RootDnaId { get; set; }
+        public Guid? Child1DnaId { get; set; }
+        public Guid? Child2DnaId { get; set; }
+        public Guid? Child3DnaId { get; set; }
+        public Guid? Child4DnaId { get; set; }
 
         public string? Root { get; set; } = string.Empty;
 

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

@@ -125,14 +125,74 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
 
+            // กรองสิทธิ์
+            string role = jsonData["result"]?.ToString() ?? "";
+            var profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), token.Replace("Bearer ", ""));
+            var node = profileAdmin?.Node;
+            string? nodeIdStr = null;
+            if (role == "NORMAL" || role == "CHILD")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child4DnaId
+                          : node == 3 ? profileAdmin?.Child3DnaId
+                          : node == 2 ? profileAdmin?.Child2DnaId
+                          : node == 1 ? profileAdmin?.Child1DnaId
+                          : node == 0 ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "BROTHER")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child3DnaId
+                          : node == 3 ? profileAdmin?.Child2DnaId
+                          : node == 2 ? profileAdmin?.Child1DnaId
+                          : (node == 1 || node == 0) ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "ROOT")
+            {
+                nodeIdStr = profileAdmin?.RootDnaId;
+            }
+            Guid? nodeId = Guid.TryParse(nodeIdStr, out var ng) ? ng : (Guid?)null;
+
             var page = req.page <= 0 ? 1 : req.page;
             var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
             var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
             var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
 
             var data_search = (from x in _context.DisciplineComplaints
-                               where x.Title.Contains(keyword) ||
-                                       (x.Appellant == null ? false : x.Appellant.Contains(keyword))
+                               where
+                               (
+                                   x.Title.Contains(keyword) ||
+                                   (x.Appellant == null ? false : x.Appellant.Contains(keyword))
+                               )
+                               &&
+                               (
+                                   role == "OWNER" ? true :
+                                   role == "ROOT" ? x.RootDnaId == nodeId :
+                                   role == "CHILD" ? (
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       node == 3 ? x.Child3DnaId == nodeId :
+                                       node == 2 ? x.Child2DnaId == nodeId :
+                                       node == 1 ? x.Child1DnaId == nodeId :
+                                       node == 0 ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "BROTHER" ? (
+                                       node == 4 ? x.Child3DnaId == nodeId :
+                                       node == 3 ? x.Child2DnaId == nodeId :
+                                       node == 2 ? x.Child1DnaId == nodeId :
+                                       (node == 1 || node == 0) ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "NORMAL" ? (
+                                       node == 0 ? x.RootDnaId == nodeId && x.Child1DnaId == null :
+                                       node == 1 ? x.Child1DnaId == nodeId && x.Child2DnaId == null :
+                                       node == 2 ? x.Child2DnaId == nodeId && x.Child3DnaId == null :
+                                       node == 3 ? x.Child3DnaId == nodeId && x.Child4DnaId == null :
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       true
+                                   ) :
+                                   true
+                               )
                                select x).ToList();
 
             if (status.Trim().ToUpper() != "ALL")
@@ -466,6 +526,10 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
                 Description = req.description,
                 DateReceived = req.dateReceived,
                 RootDnaId = profile.RootDnaId,
+                Child1DnaId = profile.Child1DnaId,
+                Child2DnaId = profile.Child2DnaId,
+                Child3DnaId = profile.Child3DnaId,
+                Child4DnaId = profile.Child4DnaId,
                 LevelConsideration = req.levelConsideration == null ? null : req.levelConsideration.Trim().ToUpper(),
                 DateConsideration = req.dateConsideration,
                 OffenseDetails = req.offenseDetails == null ? null : req.offenseDetails.Trim().ToUpper(),
@@ -739,6 +803,10 @@ namespace BMA.EHR.DisciplineComplaint.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/Controllers/DisciplineDisciplinaryController.cs

@@ -30,12 +30,14 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly NotificationRepository _repositoryNoti;
         private readonly PermissionRepository _permission;
+        private readonly UserProfileRepository _userProfileRepository;
 
         public DisciplineDisciplinaryController(DisciplineDbContext context,
                                    MinIODisciplineService documentService,
                                    NotificationRepository repositoryNoti,
                                    IHttpContextAccessor httpContextAccessor,
-                                   PermissionRepository permission)
+                                   PermissionRepository permission,
+                                   UserProfileRepository userProfileRepository)
         {
             // _repository = repository;
             _context = context;
@@ -43,6 +45,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             _httpContextAccessor = httpContextAccessor;
             _repositoryNoti = repositoryNoti;
             _permission = permission;
+            _userProfileRepository = userProfileRepository;
         }
 
         #region " Properties "
@@ -50,6 +53,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
         private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
 
         private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
+        private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
 
         #endregion
 
@@ -118,15 +122,75 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
 
+            // กรองสิทธิ์
+            string role = jsonData["result"]?.ToString() ?? "";
+            var profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), token.Replace("Bearer ", ""));
+            var node = profileAdmin?.Node;
+            string? nodeIdStr = null;
+            if (role == "NORMAL" || role == "CHILD")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child4DnaId
+                          : node == 3 ? profileAdmin?.Child3DnaId
+                          : node == 2 ? profileAdmin?.Child2DnaId
+                          : node == 1 ? profileAdmin?.Child1DnaId
+                          : node == 0 ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "BROTHER")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child3DnaId
+                          : node == 3 ? profileAdmin?.Child2DnaId
+                          : node == 2 ? profileAdmin?.Child1DnaId
+                          : (node == 1 || node == 0) ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "ROOT")
+            {
+                nodeIdStr = profileAdmin?.RootDnaId;
+            }
+            Guid? nodeId = Guid.TryParse(nodeIdStr, out var ng) ? ng : (Guid?)null;
+
             var page = req.page <= 0 ? 1 : req.page;
             var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
             var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
             var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
 
             var data_search = (from x in _context.DisciplineDisciplinarys
-                               where x.Title.Contains(keyword) ||
-                                  x.DisciplinaryFaultLevel.Contains(keyword) ||
-                                  x.DisciplinaryCaseFault.Contains(keyword)
+                               where
+                               (
+                                   x.Title.Contains(keyword) ||
+                                   x.DisciplinaryFaultLevel.Contains(keyword) ||
+                                   x.DisciplinaryCaseFault.Contains(keyword)
+                               )
+                               &&
+                               (
+                                   role == "OWNER" ? true :
+                                   role == "ROOT" ? x.RootDnaId == nodeId :
+                                   role == "CHILD" ? (
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       node == 3 ? x.Child3DnaId == nodeId :
+                                       node == 2 ? x.Child2DnaId == nodeId :
+                                       node == 1 ? x.Child1DnaId == nodeId :
+                                       node == 0 ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "BROTHER" ? (
+                                       node == 4 ? x.Child3DnaId == nodeId :
+                                       node == 3 ? x.Child2DnaId == nodeId :
+                                       node == 2 ? x.Child1DnaId == nodeId :
+                                       (node == 1 || node == 0) ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "NORMAL" ? (
+                                       node == 0 ? x.RootDnaId == nodeId && x.Child1DnaId == null :
+                                       node == 1 ? x.Child1DnaId == nodeId && x.Child2DnaId == null :
+                                       node == 2 ? x.Child2DnaId == nodeId && x.Child3DnaId == null :
+                                       node == 3 ? x.Child3DnaId == nodeId && x.Child4DnaId == null :
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       true
+                                   ) :
+                                   true
+                               )
                                select x).ToList();
             if (status.Trim().ToUpper() != "ALL")
                 data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();

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

@@ -32,13 +32,15 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
         private readonly NotificationRepository _repositoryNoti;
         private readonly PermissionRepository _permission;
         private readonly IConfiguration _configuration;
+        private readonly UserProfileRepository _userProfileRepository;
 
         public DisciplineInvestigateController(DisciplineDbContext context,
                                    MinIODisciplineService documentService,
                                    NotificationRepository repositoryNoti,
                                    IHttpContextAccessor httpContextAccessor,
                                    IConfiguration configuration,
-                                   PermissionRepository permission)
+                                   PermissionRepository permission,
+                                   UserProfileRepository userProfileRepository)
         {
             // _repository = repository;
             _context = context;
@@ -47,6 +49,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
             _repositoryNoti = repositoryNoti;
             _permission = permission;
             _configuration = configuration;
+            _userProfileRepository = userProfileRepository;
         }
 
         #region " Properties "
@@ -117,6 +120,35 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
+
+            // กรองสิทธิ์
+            string role = jsonData["result"]?.ToString() ?? "";
+            var profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), token.Replace("Bearer ", ""));
+            var node = profileAdmin?.Node;
+            string? nodeIdStr = null;
+            if (role == "NORMAL" || role == "CHILD")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child4DnaId
+                          : node == 3 ? profileAdmin?.Child3DnaId
+                          : node == 2 ? profileAdmin?.Child2DnaId
+                          : node == 1 ? profileAdmin?.Child1DnaId
+                          : node == 0 ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "BROTHER")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child3DnaId
+                          : node == 3 ? profileAdmin?.Child2DnaId
+                          : node == 2 ? profileAdmin?.Child1DnaId
+                          : (node == 1 || node == 0) ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "ROOT")
+            {
+                nodeIdStr = profileAdmin?.RootDnaId;
+            }
+            Guid? nodeId = Guid.TryParse(nodeIdStr, out var ng) ? ng : (Guid?)null;
+
             var page = req.page <= 0 ? 1 : req.page;
             var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
             var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
@@ -124,6 +156,35 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
 
             var data_search = (from x in _context.DisciplineInvestigates
                                where x.Title.Contains(keyword)
+                               &&
+                               (
+                                   role == "OWNER" ? true :
+                                   role == "ROOT" ? x.RootDnaId == nodeId :
+                                   role == "CHILD" ? (
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       node == 3 ? x.Child3DnaId == nodeId :
+                                       node == 2 ? x.Child2DnaId == nodeId :
+                                       node == 1 ? x.Child1DnaId == nodeId :
+                                       node == 0 ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "BROTHER" ? (
+                                       node == 4 ? x.Child3DnaId == nodeId :
+                                       node == 3 ? x.Child2DnaId == nodeId :
+                                       node == 2 ? x.Child1DnaId == nodeId :
+                                       (node == 1 || node == 0) ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "NORMAL" ? (
+                                       node == 0 ? x.RootDnaId == nodeId && x.Child1DnaId == null :
+                                       node == 1 ? x.Child1DnaId == nodeId && x.Child2DnaId == null :
+                                       node == 2 ? x.Child2DnaId == nodeId && x.Child3DnaId == null :
+                                       node == 3 ? x.Child3DnaId == nodeId && x.Child4DnaId == null :
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       true
+                                   ) :
+                                   true
+                               )
                                select x).ToList();
             if (status.Trim().ToUpper() != "ALL")
                 data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
@@ -828,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/Controllers/DisciplineResultController.cs

@@ -34,12 +34,14 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IConfiguration _configuration;
         private readonly PermissionRepository _permission;
+        private readonly UserProfileRepository _userProfileRepository;
 
         public DisciplineResultController(DisciplineDbContext context,
                                    MinIODisciplineService documentService,
                                    IHttpContextAccessor httpContextAccessor,
                                    IConfiguration configuration,
-                                   PermissionRepository permission)
+                                   PermissionRepository permission,
+                                   UserProfileRepository userProfileRepository)
         {
             // _repository = repository;
             _context = context;
@@ -47,6 +49,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
             _httpContextAccessor = httpContextAccessor;
             _configuration = configuration;
             _permission = permission;
+            _userProfileRepository = userProfileRepository;
         }
 
         #region " Properties "
@@ -138,6 +141,34 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
 
+            // กรองสิทธิ์
+            string role = jsonData["result"]?.ToString() ?? "";
+            var profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), token.Replace("Bearer ", ""));
+            var node = profileAdmin?.Node;
+            string? nodeIdStr = null;
+            if (role == "NORMAL" || role == "CHILD")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child4DnaId
+                          : node == 3 ? profileAdmin?.Child3DnaId
+                          : node == 2 ? profileAdmin?.Child2DnaId
+                          : node == 1 ? profileAdmin?.Child1DnaId
+                          : node == 0 ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "BROTHER")
+            {
+                nodeIdStr = node == 4 ? profileAdmin?.Child3DnaId
+                          : node == 3 ? profileAdmin?.Child2DnaId
+                          : node == 2 ? profileAdmin?.Child1DnaId
+                          : (node == 1 || node == 0) ? profileAdmin?.RootDnaId
+                          : null;
+            }
+            else if (role == "ROOT")
+            {
+                nodeIdStr = profileAdmin?.RootDnaId;
+            }
+            Guid? nodeId = Guid.TryParse(nodeIdStr, out var ng) ? ng : (Guid?)null;
+
             var page = req.page <= 0 ? 1 : req.page;
             var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
             var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
@@ -150,6 +181,34 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                (x.ResultTitleType == null ? false : x.ResultTitleType.Contains(keyword)) ||
                                (x.ResultYear == null ? false : (x.ResultYear + 543).ToString().Contains(keyword)))
                                .Where(x => x.Status.Contains("DONE") || x.Status.Contains("REPORT"))
+                               .Where(x =>
+                                   role == "OWNER" ? true :
+                                   role == "ROOT" ? x.RootDnaId == nodeId :
+                                   role == "CHILD" ? (
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       node == 3 ? x.Child3DnaId == nodeId :
+                                       node == 2 ? x.Child2DnaId == nodeId :
+                                       node == 1 ? x.Child1DnaId == nodeId :
+                                       node == 0 ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "BROTHER" ? (
+                                       node == 4 ? x.Child3DnaId == nodeId :
+                                       node == 3 ? x.Child2DnaId == nodeId :
+                                       node == 2 ? x.Child1DnaId == nodeId :
+                                       (node == 1 || node == 0) ? x.RootDnaId == nodeId :
+                                       true
+                                   ) :
+                                   role == "NORMAL" ? (
+                                       node == 0 ? x.RootDnaId == nodeId && x.Child1DnaId == null :
+                                       node == 1 ? x.Child1DnaId == nodeId && x.Child2DnaId == null :
+                                       node == 2 ? x.Child2DnaId == nodeId && x.Child3DnaId == null :
+                                       node == 3 ? x.Child3DnaId == nodeId && x.Child4DnaId == null :
+                                       node == 4 ? x.Child4DnaId == nodeId :
+                                       true
+                                   ) :
+                                   true
+                               )
                                .ToListAsync();
             if (status.Trim().ToUpper() != "ALL")
                 data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();

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.Domain/Models/Discipline/DisciplineComplaint.cs

@@ -61,6 +61,14 @@ namespace BMA.EHR.Domain.Models.Discipline
 
         [Comment("RootDnaId")]
         public Guid? RootDnaId { get; set; }
+        [Comment("Child1DnaId")]
+        public Guid? Child1DnaId { get; set; }
+        [Comment("Child2DnaId")]
+        public Guid? Child2DnaId { get; set; }
+        [Comment("Child3DnaId")]
+        public Guid? Child3DnaId { get; set; }
+        [Comment("Child4DnaId")]
+        public Guid? Child4DnaId { get; set; }
         public virtual List<DisciplineComplaint_Profile> DisciplineComplaint_Profiles { get; set; } = new List<DisciplineComplaint_Profile>();
         public virtual List<DisciplineComplaint_Doc> DisciplineComplaint_Docs { get; set; } = new List<DisciplineComplaint_Doc>();
         public virtual List<DisciplineInvestigate> DisciplineInvestigates { get; set; } = new List<DisciplineInvestigate>();

BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary.cs

@@ -148,6 +148,14 @@ namespace BMA.EHR.Domain.Models.Discipline
 
         [Comment("RootDnaId")]
         public Guid? RootDnaId { get; set; }
+        [Comment("Child1DnaId")]
+        public Guid? Child1DnaId { get; set; }
+        [Comment("Child2DnaId")]
+        public Guid? Child2DnaId { get; set; }
+        [Comment("Child3DnaId")]
+        public Guid? Child3DnaId { get; set; }
+        [Comment("Child4DnaId")]
+        public Guid? Child4DnaId { get; set; }
 
         public DisciplineInvestigate DisciplineInvestigate { get; set; }
         public virtual List<DisciplineDisciplinary_ProfileComplaintInvestigate> DisciplineDisciplinary_ProfileComplaintInvestigates { get; set; } = new List<DisciplineDisciplinary_ProfileComplaintInvestigate>();

BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate.cs

@@ -92,6 +92,14 @@ namespace BMA.EHR.Domain.Models.Discipline
 
         [Comment("RootDnaId")]
         public Guid? RootDnaId { get; set; }
+        [Comment("Child1DnaId")]
+        public Guid? Child1DnaId { get; set; }
+        [Comment("Child2DnaId")]
+        public Guid? Child2DnaId { get; set; }
+        [Comment("Child3DnaId")]
+        public Guid? Child3DnaId { get; set; }
+        [Comment("Child4DnaId")]
+        public Guid? Child4DnaId { get; set; }
         public DisciplineComplaint DisciplineComplaint { get; set; }
         public virtual List<DisciplineInvestigate_ProfileComplaint> DisciplineInvestigate_ProfileComplaints { get; set; } = new List<DisciplineInvestigate_ProfileComplaint>();
         public virtual List<DisciplineInvestigate_DocComplaint> DisciplineInvestigate_DocComplaints { get; set; } = new List<DisciplineInvestigate_DocComplaint>();

BMA.EHR.Infrastructure/Migrations/DisciplineDb/20260717041310_AddChildDnaIdsToDiscipline.cs

@@ -0,0 +1,163 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
+{
+    /// <inheritdoc />
+    public partial class AddChildDnaIdsToDiscipline : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child1DnaId",
+                table: "DisciplineInvestigates",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child1DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child2DnaId",
+                table: "DisciplineInvestigates",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child2DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child3DnaId",
+                table: "DisciplineInvestigates",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child3DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child4DnaId",
+                table: "DisciplineInvestigates",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child4DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child1DnaId",
+                table: "DisciplineDisciplinarys",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child1DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child2DnaId",
+                table: "DisciplineDisciplinarys",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child2DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child3DnaId",
+                table: "DisciplineDisciplinarys",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child3DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child4DnaId",
+                table: "DisciplineDisciplinarys",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child4DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child1DnaId",
+                table: "DisciplineComplaints",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child1DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child2DnaId",
+                table: "DisciplineComplaints",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child2DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child3DnaId",
+                table: "DisciplineComplaints",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child3DnaId",
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "Child4DnaId",
+                table: "DisciplineComplaints",
+                type: "char(36)",
+                nullable: true,
+                comment: "Child4DnaId",
+                collation: "ascii_general_ci");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Child1DnaId",
+                table: "DisciplineInvestigates");
+
+            migrationBuilder.DropColumn(
+                name: "Child2DnaId",
+                table: "DisciplineInvestigates");
+
+            migrationBuilder.DropColumn(
+                name: "Child3DnaId",
+                table: "DisciplineInvestigates");
+
+            migrationBuilder.DropColumn(
+                name: "Child4DnaId",
+                table: "DisciplineInvestigates");
+
+            migrationBuilder.DropColumn(
+                name: "Child1DnaId",
+                table: "DisciplineDisciplinarys");
+
+            migrationBuilder.DropColumn(
+                name: "Child2DnaId",
+                table: "DisciplineDisciplinarys");
+
+            migrationBuilder.DropColumn(
+                name: "Child3DnaId",
+                table: "DisciplineDisciplinarys");
+
+            migrationBuilder.DropColumn(
+                name: "Child4DnaId",
+                table: "DisciplineDisciplinarys");
+
+            migrationBuilder.DropColumn(
+                name: "Child1DnaId",
+                table: "DisciplineComplaints");
+
+            migrationBuilder.DropColumn(
+                name: "Child2DnaId",
+                table: "DisciplineComplaints");
+
+            migrationBuilder.DropColumn(
+                name: "Child3DnaId",
+                table: "DisciplineComplaints");
+
+            migrationBuilder.DropColumn(
+                name: "Child4DnaId",
+                table: "DisciplineComplaints");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/DisciplineDb/DisciplineDbContextModelSnapshot.cs

@@ -32,6 +32,22 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("longtext")
                         .HasComment("ผู้ร้องเรียน");
 
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child1DnaId");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child2DnaId");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child3DnaId");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child4DnaId");
+
                     b.Property<string>("ComplaintFrom")
                         .HasColumnType("longtext")
                         .HasComment("รับเรื่องร้องเรียนจาก ระบุว่ารับเรื่องมาจากใคร/หน่วยงานไหน (สตง., ปปช., ปปท., จดหมาย, อีเมล, โทรศัพท์, บอกกล่าว)");
@@ -864,6 +880,22 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("longtext")
                         .HasComment("ผู้ร้องเรียน");
 
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child1DnaId");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child2DnaId");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child3DnaId");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child4DnaId");
+
                     b.Property<string>("ComplaintFrom")
                         .HasColumnType("longtext")
                         .HasComment("รับเรื่องร้องเรียนจาก ระบุว่ารับเรื่องมาจากใคร/หน่วยงานไหน (สตง., ปปช., ปปท., จดหมาย, อีเมล, โทรศัพท์, บอกกล่าว)");
@@ -2087,6 +2119,22 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("longtext")
                         .HasComment("ผู้ร้องเรียน");
 
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child1DnaId");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child2DnaId");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child3DnaId");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Child4DnaId");
+
                     b.Property<string>("ComplaintFrom")
                         .HasColumnType("longtext")
                         .HasComment("รับเรื่องร้องเรียนจาก ระบุว่ารับเรื่องมาจากใคร/หน่วยงานไหน (สตง., ปปช., ปปท., จดหมาย, อีเมล, โทรศัพท์, บอกกล่าว)");

BMA.EHR.Leave/Controllers/LeaveController.cs

@@ -30,6 +30,7 @@ using RabbitMQ.Client.Events;
 using Swashbuckle.AspNetCore.Annotations;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
+using System.Reflection.Metadata.Ecma335;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
@@ -779,6 +780,16 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     try
                     {
+                        // var get current status
+                        var task = await _checkInJobStatusRepository.GetByTaskIdAsync(job.TaskId);
+                        
+                        // return if stask status != "PENDING"
+                        if (task is not null)
+                        {
+                            if (task.Status != "PENDING")
+                                continue;
+                        }
+                        
                         // อ่านข้อมูลเดิมจาก AdditionalData
                         if (string.IsNullOrEmpty(job.AdditionalData))
                         {
@@ -1075,6 +1086,9 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             try
             {
+                
+                
+                
                 // อัปเดตสถานะเป็น PROCESSING
                 if (taskId != Guid.Empty)
                 {
@@ -2744,7 +2758,9 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             if (old != null)
             {
-                return Error(new Exception("ไม่สามารถทำรายการได้ เนื่องจากมีการกำหนดรอบการทำงานในวันที่นี้ไว้แล้ว"), StatusCodes.Status400BadRequest);
+                // ลบของเก่าออกเพื่อใส่ของใหม่
+                await _userDutyTimeRepository.DeleteAsync(old);
+                //return Error(new Exception("ไม่สามารถทำรายการได้ เนื่องจากมีการกำหนดรอบการทำงานในวันที่นี้ไว้แล้ว"), StatusCodes.Status400BadRequest);
             }
 
             var data = new UserDutyTime
@@ -2801,8 +2817,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
                 if (old != null)
                 {
-                    continue; // move to next item if already exist, not return error
-                    //return Error(new Exception($"กำหนดรอบลงเวลาของ {req.FirstName} {req.LastName} ผิดพลาด เนื่องจากมีการกำหนดรอบการทำงานในวันที่นี้ไว้แล้ว"), StatusCodes.Status400BadRequest);
+                    // ลบของเก่าออก เพื่อที่จะใส่รายการใหม่
+                    await _userDutyTimeRepository.DeleteAsync(old);
                 }
 
                 var data = new UserDutyTime
@@ -3057,7 +3073,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             if (old != null)
             {
-                return Error(new Exception("ไม่สามารถทำรายการได้ เนื่องจากมีการกำหนดรอบการทำงานในวันที่นี้ไว้แล้ว"), StatusCodes.Status400BadRequest);
+                await _userDutyTimeRepository.DeleteAsync(old);
+                //return Error(new Exception("ไม่สามารถทำรายการได้ เนื่องจากมีการกำหนดรอบการทำงานในวันที่นี้ไว้แล้ว"), StatusCodes.Status400BadRequest);
             }
 
             var data = new UserDutyTime

BMA.EHR.Leave/Controllers/LeaveRequestController.cs

@@ -1053,6 +1053,16 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> CheckUserLeaveAsync([FromBody] GetLeaveCheckDto req)
         {
             var totalDay = (double)req.StartLeaveDate.DiffDay(req.EndLeaveDate.Date);
+            if (req.StartLeaveDate == req.EndLeaveDate)
+            {
+                if (req.LeaveRange != "ALL")
+                    totalDay -= 0.5;
+            }
+            else
+            {
+                if(req.LeaveRangeEnd != "ALL")
+                    totalDay -= 0.5;
+            }
 
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
@@ -1307,11 +1317,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                     message = "ช่วงวันลาที่ระบุไม่ถูกต้อง";
                 }
             
-                if (req.LeaveRange != "ALL")
-                    totalDay -= 0.5;
-
-                if (req.LeaveRangeEnd != "ALL")
-                    totalDay -= 0.5;
+                // if (req.LeaveRange != "ALL")
+                //     totalDay -= 0.5;
+                //
+                // if (req.LeaveRangeEnd != "ALL")
+                //     totalDay -= 0.5;
             
             }
             else if (totalDay == 1)
@@ -1322,8 +1332,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     isLeave = false;
                     message = "ช่วงวันลาที่ระบุไม่ถูกต้อง";
                 }
-                if (req.LeaveRange != "ALL")
-                    totalDay -= 0.5;
+                // if (req.LeaveRange != "ALL")
+                //     totalDay -= 0.5;
             
             }
 

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();
 }

reprocess.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+#
+# เรียก Keycloak/OpenID Connect token endpoint เพื่อขอ access token
+# ผ่าน client_credentials grant type (form-urlencoded)
+#
+
+set -euo pipefail
+
+# ฟังก์ชันเขียน log พร้อม timestamp (YYYY-MM-DD HH:MM:SS)
+log() {
+  printf '[%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$1"
+}
+# log ส่งออกไป stderr (เหมาะกับ error/เตือน)
+log_err() {
+  printf '[%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$1" >&2
+}
+
+# --- เขียน log ลงไฟล์ (แยกรายวัน) เก็บไว้แค่ 2 วัน ---
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LOG_DIR="${SCRIPT_DIR}/logs"
+mkdir -p "${LOG_DIR}"
+# ลบ log เก่ากว่า 2 วัน
+find "${LOG_DIR}" -name 'reprocess_*.log' -type f -mtime +2 -delete
+LOG_FILE="${LOG_DIR}/reprocess_$(date '+%Y-%m-%d').log"
+if [[ -t 1 ]]; then
+  # รันมือ (มี tty): แสดงบนหน้าจอ + เก็บลงไฟล์
+  exec > >(tee -a "${LOG_FILE}") 2>&1
+else
+  # รันผ่าน cron (ไม่มี tty): เก็บลงไฟล์อย่างเดียว เพื่อไม่ให้ซ้อนกับ redirect ของ cron
+  exec >>"${LOG_FILE}" 2>&1
+fi
+
+# --- ตรวจเวลาทำการ: ทำงานเฉพาะช่วง 07:00-09:59 และ 15:00-17:59 ของทุกวัน ---
+# (10#$H บังคับตีความเลขฐาน 10 ป้องกันปัญหา 08/09 ถูกอ่านเป็นเลขฐาน 8)
+CURRENT_HOUR=$(date '+%H')
+if (( 10#$CURRENT_HOUR >= 7 && 10#$CURRENT_HOUR < 10 )) || \
+   (( 10#$CURRENT_HOUR >= 15 && 10#$CURRENT_HOUR < 18 )); then
+  log "อยู่ในช่วงเวลาทำการ (hour=${CURRENT_HOUR}) — เริ่มทำงาน"
+else
+  log "นอกช่วงเวลาทำการ (hour=${CURRENT_HOUR}) — ข้ามการทำงาน"
+  exit 0
+fi
+
+TOKEN_URL="https://hrms-id.bangkok.go.th/realms/hrms/protocol/openid-connect/token"
+CLIENT_ID="gettoken"
+CLIENT_SECRET="obeDw3t3dsDkIkhqzszul6VybAaoRCjf"
+
+response=$(curl -sS -X POST "${TOKEN_URL}" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  --data-urlencode "client_id=${CLIENT_ID}" \
+  --data-urlencode "client_secret=${CLIENT_SECRET}" \
+  --data-urlencode "grant_type=client_credentials")
+
+# ดึงเฉพาะ access_token ออกมาจาก JSON response
+access_token=$(printf '%s' "${response}" | python3 -c "import sys, json; print(json.load(sys.stdin).get('access_token', ''))")
+
+if [[ -z "${access_token}" ]]; then
+  log_err "ไม่สามารถดึง access_token ได้ — response:"
+  printf '[%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "${response}" >&2
+  exit 1
+fi
+log "ได้ access token แล้ว"
+
+# --- เรียก API reprocess-stale-checkin-jobs โดยแนบ Bearer token ----------
+API_URL="https://hrms.bangkok.go.th/api/v1/leave/reprocess-stale-checkin-jobs?timeoutMinutes=15"
+
+log "กำลังเรียก ${API_URL}"
+http_code=$(curl -sS -o /tmp/reprocess_response.txt -w "%{http_code}" \
+  --max-time 600 \
+  -X POST "${API_URL}" \
+  -H "Authorization: Bearer ${access_token}" \
+  -H "Content-Type: application/json")
+
+log "HTTP status: ${http_code}"
+log "Response:"
+printf '[%s] ' "$(date '+%Y-%m-%d %H:%M:%S')"
+cat /tmp/reprocess_response.txt
+echo
+
+if [[ "${http_code}" -ge 200 && "${http_code}" -lt 300 ]]; then
+  log "สำเร็จ"
+  exit 0
+else
+  log_err "ล้มเหลว (HTTP ${http_code})"
+  exit 1
+fi