Merge branch 'develop' into dev

fix #2547
Merge branch 'develop-Bright' into dev
2026-06-04 11:52:51 +07:00 · 2026-06-04 11:52:26 +07:00 · 2026-06-04 11:34:34 +07:00 · 2026-06-04 11:34:06 +07:00 · 2026-06-04 10:53:49 +07:00 · 2026-06-04 10:19:11 +07:00
9 changed files with 39 additions and 16 deletions
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@ -1952,6 +1952,23 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                return 0;
        }
        
+        public async Task<double> GetSumApproveLeaveTotalByTypeAndRangeForUserBefore(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
+        {
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
+                .Include(x => x.Type)
+                .Where(x => x.KeycloakUserId == keycloakUserId)
+                .Where(x => x.Type.Id == leaveTypeId)
+                .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ?? x.CreatedAt) < endDate))
+                //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
+                .ToListAsync();
+
+            if (data.Count > 0)
+                return data.Sum(x => x.LeaveTotal);
+            else
+                return 0;
+        }
+        
        public async Task<double> GetSumApproveLeaveTotalByTypeAndRangeForUserByProfile(Guid profileId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
        {
            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@ -164,7 +164,7 @@ namespace BMA.EHR.Leave.Service.Controllers
            if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
                thisYear = thisYear + 1;
            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, data.Type.Id, data.KeycloakUserId);
-            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser2(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUserBefore(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
            if (leaveData != null)
            {
                sumLeave += leaveData.BeginningLeaveDays;
@ -346,7 +346,7 @@ namespace BMA.EHR.Leave.Service.Controllers
            //var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);

            
-            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser2(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUserBefore(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
            if (leaveData != null)
            {
                sumLeave += leaveData.BeginningLeaveDays;
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
@ -542,7 +542,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                placementAppointment.positionOld = org.result.position;
                placementAppointment.PositionLevelOld = org.result.posLevelName;
                placementAppointment.PositionTypeOld = org.result.posTypeName;
-                placementAppointment.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
+                placementAppointment.PositionNumberOld = org.result.posNo;
                placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                        (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                        (org.result.child2 == null ? "" : org.result.child2 + "\n") +
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@ -514,9 +514,8 @@ namespace BMA.EHR.Placement.Service.Controllers
            {

                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-
+                Console.Write($"[PlacementReceiveController] Check-Citizen API-Key : {_configuration["API_KEY"]}");
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                var _res = await client.PostAsJsonAsync(apiUrlCheckCitizen, new

                {
@ -541,6 +540,7 @@ namespace BMA.EHR.Placement.Service.Controllers
            using (var client = new HttpClient())
            {
                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                Console.Write("[PlacementReceiveController] Check-Position");
                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
                var _res = await client.SendAsync(_req);
@ -831,7 +831,7 @@ namespace BMA.EHR.Placement.Service.Controllers

                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));

-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);

                var _res = await client.PostAsJsonAsync(apiUrlCheckCitizen, new

--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@ -448,7 +448,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                retirementOther.positionAreaOld = org.result.positionArea;
                retirementOther.PositionLevelOld = org.result.posLevelName;
                retirementOther.PositionTypeOld = org.result.posTypeName;
-                retirementOther.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
+                retirementOther.PositionNumberOld = org.result.posNo;
                retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                        (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                        (org.result.child2 == null ? "" : org.result.child2 + "\n") +
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@ -1290,7 +1290,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                retirementResign.positionAreaOld = org.result.positionArea;
                retirementResign.PositionLevelOld = org.result.posLevelName;
                retirementResign.PositionTypeOld = org.result.posTypeName;
-                retirementResign.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
+                retirementResign.PositionNumberOld = org.result.posNo;
                retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                        (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                        (org.result.child2 == null ? "" : org.result.child2 + "\n") +
@ -1439,7 +1439,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                retirementResign.positionAreaOld = org.result.positionArea;
                retirementResign.PositionLevelOld = org.result.posLevelName;
                retirementResign.PositionTypeOld = org.result.posTypeName;
-                retirementResign.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
+                retirementResign.PositionNumberOld = org.result.posNo;
                retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                        (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                        (org.result.child2 == null ? "" : org.result.child2 + "\n") +
@ -1513,7 +1513,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
                return Error(GlobalMessages.RetirementResignNotFound, 404);

            updated.Location = req.Location;
-            updated.ActiveDate = req.ActiveDate;
+            if (req.SendDate != null)
+            {
+                updated.SendDate = req.SendDate;
+            }
            // updated.Reason = req.Reason;
            updated.Remark = req.Remark;
            updated.ReasonResign = req.Reason;
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@ -1227,7 +1227,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                retirementResignEmployee.PositionOld = org.result.position;
                retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
                retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
-                retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
+                retirementResignEmployee.PositionNumberOld = org.result.posNo;
                retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                        (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                        (org.result.child2 == null ? "" : org.result.child2 + "\n") +
@ -1381,7 +1381,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                retirementResignEmployee.PositionOld = org.result.position;
                retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
                retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
-                retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
+                retirementResignEmployee.PositionNumberOld = org.result.posNo;
                retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                        (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                        (org.result.child2 == null ? "" : org.result.child2 + "\n") +
@ -1450,7 +1450,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
                return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404);

            updated.Location = req.Location;
-            updated.ActiveDate = req.ActiveDate;
+            if (req.SendDate != null)
+            {
+                updated.SendDate = req.SendDate;
+            }
            // updated.Reason = req.Reason;
            updated.Remark = req.Remark;
            updated.ReasonResign = req.Reason;
--- a/BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
+++ b/BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
@ -6,7 +6,7 @@ namespace BMA.EHR.Retirement.Service.Requests
    public class RetirementResignEmployeeRequest
    {
        public string? Location { get; set; }
-        // public DateTime? SendDate { get; set; }
+        public DateTime? SendDate { get; set; }
        public DateTime? ActiveDate { get; set; }
        public string? Reason { get; set; }
        public string? Remark { get; set; }
--- a/BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
+++ b/BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
@ -6,7 +6,7 @@ namespace BMA.EHR.Retirement.Service.Requests
    public class RetirementResignRequest
    {
        public string? Location { get; set; }
-        // public DateTime? SendDate { get; set; }
+        public DateTime? SendDate { get; set; }
        public DateTime? ActiveDate { get; set; }
        public string? Reason { get; set; }
        public string? Remark { get; set; }
Author	SHA1	Message	Date
harid	f0c493a026	Merge branch 'develop' into dev All checks were successful Build & Deploy Retirement Service / build (push) Successful in 1m46s Details	2026-06-04 11:52:51 +07:00
harid	fe5c2cd7c1	fix #2547	2026-06-04 11:52:26 +07:00
harid	c4209400ff	Merge branch 'develop-Bright' into dev All checks were successful Build & Deploy Retirement Service / build (push) Successful in 1m52s Details	2026-06-04 11:34:34 +07:00
harid	d6a7f1a5ca	fix แก้ไขวันที่ยื่นขอลาออกแล้วข้อมูลไม่เปลี่ยน #2547	2026-06-04 11:34:06 +07:00
harid	f50efc632b	Merge branch 'develop' into develop-Bright	2026-06-04 10:53:49 +07:00
Adisak	5f9c49f479	Merge branch 'develop' into dev All checks were successful Build & Deploy Placement Service / build (push) Successful in 1m45s Details Build & Deploy Retirement Service / build (push) Successful in 1m45s Details	2026-06-04 10:19:11 +07:00
Adisak	48aab28e04	Merge branch 'adiDev' into develop	2026-06-04 10:15:42 +07:00
Adisak	1f7951dc4c	update ลาออก admin	2026-06-04 10:15:33 +07:00
harid	d3a174faa0	log placementReceive	2026-06-04 10:10:31 +07:00
Suphonchai Phoonsawat	afa5c85393	fix #2545 All checks were successful Build & Deploy Leave Service / build (push) Successful in 1m48s Details	2026-06-04 10:01:11 +07:00
Adisak	077b60b1c3	Merge branch 'develop' into adiDev All checks were successful Build & Deploy Placement Service / build (push) Successful in 1m55s Details Build & Deploy Retirement Service / build (push) Successful in 1m46s Details	2026-06-04 09:38:03 +07:00
Adisak	efc96dfb6d	แก้ format ฟิว posMasterNo (6)	2026-06-04 09:37:29 +07:00