diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs index 567c38c5..435462d3 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs @@ -971,7 +971,7 @@ namespace BMA.EHR.Insignia.Service.Controllers return Error(GlobalMessages.InsigniaRequestNotFound); var orgIdSend = await _context.InsigniaRequests .Where(x => x.Period == insigniaPeriod) - .Where(x => x.RequestStatus == "st1") + .Where(x => x.RequestStatus == "st6") .Select(x => x.OrganizationId) .ToListAsync(); diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 5461908d..55493a74 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -2038,6 +2038,8 @@ namespace BMA.EHR.Leave.Service.Controllers #endregion + #region " รายการลารายบุคคล " + /// /// LV1_026 - รายการลารายบุคคล (ADMIN) /// @@ -2103,5 +2105,7 @@ namespace BMA.EHR.Leave.Service.Controllers #endregion + #endregion + } } diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 064d1f4c..6b7e79f4 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1085,6 +1085,7 @@ namespace BMA.EHR.Leave.Service.Controllers var wfhTotal = 0; var studyTotal = 0; var workTotal = 0; + var seminarTotal = 0; foreach (var dd in dateList) @@ -1204,7 +1205,13 @@ namespace BMA.EHR.Leave.Service.Controllers { workTotal += 1; if (!timeStamps.IsLocationCheckIn) - wfhTotal += 1; + { + if(timeStamps.CheckInLocationName!.Contains("ปฏิบัติงานที่บ้าน")) + wfhTotal += 1; + else if (timeStamps.CheckInLocationName!.Contains("ประชุม")) + seminarTotal += 1; + } + } @@ -1260,6 +1267,7 @@ namespace BMA.EHR.Leave.Service.Controllers sickTotal = sickTotal, lateTotal = lateTotal, wfhTotal = wfhTotal, + seminarTotal = seminarTotal, studyTotal = studyTotal, employees = employees };