Merge branch 'dev' into adiDev

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

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;
@@ -2444,6 +2444,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var workTotal = 0;
                 var seminarTotal = 0;
 
+                var wfaTotal = 0; //ปฏิบัติงานนอกสถานที่
+                var outOfficeTotal = 0; //ขออนุญาติิิออกนอกสถานที่
+                var oneStopSrvrTotal = 0; //จุดบริการด่วนมหานคร
+                var otherTotal = 0; //อื่นๆ
+                
+                
+                
+                
+
                 var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
                 if (defaultRound == null)
                 {
@@ -2627,10 +2636,18 @@ namespace BMA.EHR.Leave.Service.Controllers
                             workTotal += 1;
                             if (!timeStamps.IsLocationCheckIn)
                             {
-                                if (timeStamps.CheckInLocationName == "ปฏิบัติงานที่บ้าน")
+                                if (timeStamps.CheckInLocationName!.Contains("ปฏิบัติงานที่บ้าน"))
                                     wfhTotal += 1;
                                 else if (timeStamps.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา")
                                     seminarTotal += 1;
+                                else if (timeStamps.CheckInLocationName.Contains("ปฏิบัติงานนอกสถานที่"))
+                                    wfaTotal += 1;
+                                else if (timeStamps.CheckInLocationName.Contains("ขออนุญาตออกนอกสถานที่"))
+                                    outOfficeTotal += 1;
+                                else if (timeStamps.CheckInLocationName.Contains("ปฏิบัติงานในจุดบริการด่วนมหานคร"))
+                                    oneStopSrvrTotal += 1;
+                                else if (timeStamps.CheckInLocationName.Contains("อื่นๆ"))
+                                    otherTotal += 1;
                             }
                         }
 
@@ -2781,19 +2798,36 @@ namespace BMA.EHR.Leave.Service.Controllers
                     worksheet.Cells[lastRow + 2, 8].Value = "อบรม ประชุม สัมมนาฯ";
                     worksheet.Cells[lastRow + 2, 9].Value = seminarTotal;
                     worksheet.Cells[lastRow + 2, 10].Value = "คน";
+                    worksheet.Cells[lastRow + 3, 8].Value = "ปฎิบัติงานนอกสถานที่";
+                    worksheet.Cells[lastRow + 3, 9].Value = wfaTotal;
+                    worksheet.Cells[lastRow + 3, 10].Value = "คน";
+                    worksheet.Cells[lastRow + 4, 8].Value = "ขออนุญาตออกนอกสถานที่";
+                    worksheet.Cells[lastRow + 4, 9].Value = outOfficeTotal;
+                    worksheet.Cells[lastRow + 4, 10].Value = "คน";
+                    worksheet.Cells[lastRow + 5, 8].Value = "ปฎิบัติงานในจุดบริการด่วนมหานคร";
+                    worksheet.Cells[lastRow + 5, 9].Value = oneStopSrvrTotal;
+                    worksheet.Cells[lastRow + 5, 10].Value = "คน";
+                    worksheet.Cells[lastRow + 6, 8].Value = "อื่นๆ";
+                    worksheet.Cells[lastRow + 6, 9].Value = otherTotal;
+                    worksheet.Cells[lastRow + 6, 10].Value = "คน";
+                    
+                    
+                    
+                    
+                    
                     worksheet.Cells[lastRow + 3, 2].Value = "ลาป่วย/ลากิจ";
                     worksheet.Cells[lastRow + 3, 5].Value = sickTotal;
                     worksheet.Cells[lastRow + 3, 6].Value = "คน";
                     worksheet.Cells[lastRow + 4, 2].Value = "มาสาย";
                     worksheet.Cells[lastRow + 4, 5].Value = lateTotal;
                     worksheet.Cells[lastRow + 4, 6].Value = "คน";
-                    worksheet.Cells[lastRow + 6, 2].Value = "เรียน";
+                    worksheet.Cells[lastRow + 8, 2].Value = "เรียน";
-                    worksheet.Cells[lastRow + 7, 2].Value = "เพื่อโปรดทราบ";
+                    worksheet.Cells[lastRow + 9, 2].Value = "เพื่อโปรดทราบ";
-                    worksheet.Cells[lastRow + 7, 9].Value = "ทราบ";
+                    worksheet.Cells[lastRow + 9, 9].Value = "ทราบ";
-                    worksheet.Cells[lastRow + 7, 9].Style.Font.Bold = true;
+                    worksheet.Cells[lastRow + 9, 9].Style.Font.Bold = true;
-                    worksheet.Cells[lastRow + 7, 9].Style.Font.Size = 22;
+                    worksheet.Cells[lastRow + 9, 9].Style.Font.Size = 22;
-                    worksheet.Cells[lastRow + 8, 2].Value = "................................";
+                    worksheet.Cells[lastRow + 10, 2].Value = "................................";
-                    worksheet.Cells[lastRow + 8, 9].Value = "................................";
+                    worksheet.Cells[lastRow + 10, 9].Value = "................................";
                     worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
                     var fileBytes = package.GetAsByteArray();
                     return File(fileBytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "TimeStampRecords.xlsx");

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") +

BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs

@@ -148,6 +148,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.child4OldId,
                             p.child4ShortNameOld,
                             p.PositionOld,
+                            p.PositionNumberOld,
                             p.PositionExecutiveOld,
                             p.positionExecutiveFieldOld,
                             p.positionAreaOld,

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 ", ""));
-
+                Console.Write($"[PlacementReceiveController] Check-Citizen API-Key : {_configuration["API_KEY"]}");
-                client.DefaultRequestHeaders.Add("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
 

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") +

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;

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;

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

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