fix #1547 **** รอรัน migration อีกครั้ง *****

fix #1520

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs

@@ -498,7 +498,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         {
             var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
                                     .Include(x => x.Type)
-                                    .Where(x => x.LeaveStatus == "DELETE")
+                                    .Where(x => x.LeaveStatus == "DELETE" || x.LeaveStatus == "DELETING")
                                     .AsQueryable();
 
             if (year != 0)

BMA.EHR.Domain/Models/Leave/TimeAttendants/AdditionalCheckRequest.cs

@@ -32,5 +32,14 @@ namespace BMA.EHR.Domain.Models.Leave.TimeAttendants
         public string? FirstName { get; set; }
 
         public string? LastName { get; set; }
+
+
+        public string? POI { get; set; } = string.Empty;
+
+        public double? Latitude { get; set; } = 0.0;
+
+        public double? Longitude { get; set; } = 0.0;
+
+
     }
 }

BMA.EHR.Leave/Controllers/LeaveController.cs

@@ -1859,6 +1859,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                 Prefix = profile.Prefix,
                 FirstName = profile.FirstName,
                 LastName = profile.LastName,
+
+                // fix issue #1547
+                POI = req.POI,
+                Latitude = req.Latitude,
+                Longitude = req.Longitude,
             };
             await _additionalCheckRequestRepository.AddAsync(request);
 
@@ -1963,6 +1968,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                     StatusSort = data.Status.Trim().ToLower() == "pending" ? 1 :
                                  data.Status.Trim().ToLower() == "approve" ? 2 : 3,
 
+
+                    POI = data.POI,
+                    Latitude = data.Latitude,
+                    Longitude = data.Longitude,
+
                 };
 
                 result.Add(resObj);
@@ -2036,8 +2046,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckInLon = 0,
                     CheckOutLat = 0,
                     CheckOutLon = 0,
-                    CheckInPOI = "ลงเวลากรณีพิเศษ",
+                    CheckInPOI = "",
-                    CheckOutPOI = "ลงเวลากรณีพิเศษ",
+                    CheckOutPOI = "",
                     CheckInStatus = req.CheckInStatus,
                     CheckOutStatus = req.CheckOutStatus,
 
@@ -2079,6 +2089,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                     processTimeStamp.CheckInLon = 0;
                     processTimeStamp.CheckInPOI = "ลงเวลากรณีพิเศษ";
                     processTimeStamp.CheckInStatus = req.CheckInStatus;
+
+                    processTimeStamp.CheckInPOI = requestData.POI ?? "";
+                    processTimeStamp.CheckInLat = requestData.Latitude ?? 0;
+                    processTimeStamp.CheckInLon = requestData.Longitude ?? 0;
                 }
 
                 if (requestData.CheckOutEdit)
@@ -2089,6 +2103,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                     processTimeStamp.CheckOutLon = 0;
                     processTimeStamp.CheckOutPOI = "ลงเวลากรณีพิเศษ";
                     processTimeStamp.CheckOutStatus = req.CheckOutStatus;
+
+                    processTimeStamp.CheckOutPOI = requestData.POI ?? "";
+                    processTimeStamp.CheckOutLat = requestData.Latitude ?? 0;
+                    processTimeStamp.CheckOutLon = requestData.Longitude ?? 0;
                 }
 
 

BMA.EHR.Leave/DTOs/AdditionalCheck/CreateAdditionalCheckRequestDto.cs

@@ -9,5 +9,11 @@
         public bool CheckOutEdit { get; set;}
 
         public string Description { get; set; }
+
+        public string? POI { get; set; } = string.Empty;
+
+        public double? Latitude { get; set; } = 0.0;
+
+        public double? Longitude { get; set; } = 0.0;
     }
 }

BMA.EHR.Leave/DTOs/AdditionalCheck/GetAdditionalCheckRequestDto.cs

@@ -37,5 +37,11 @@
         public string Description { get; set; }
 
         public int StatusSort { get; set; } = 0;
+
+        public string? POI { get; set; } = string.Empty;
+
+        public double? Latitude { get; set; } = 0.0;
+
+        public double? Longitude { get; set; } = 0.0;
     }
 }