fix: insignia + leave Error

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

@@ -0,0 +1,15 @@
+namespace BMA.EHR.Leave.Service.DTOs.AdditionalCheck
+{
+    public class ApproveRequestDto
+    {
+        public string CheckInTime { get; set; }
+
+        public string CheckOutTime { get; set; }
+
+        public string CheckInStatus { get; set; }
+
+        public string CheckOutStatus { get; set; }
+
+        public string Reason { get; set; }
+    }
+}

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

@@ -0,0 +1,13 @@
+namespace BMA.EHR.Leave.Service.DTOs.AdditionalCheck
+{
+    public class CreateAdditionalCheckRequestDto
+    {
+        public DateTime CheckDate { get; set; }
+
+        public bool CheckInEdit { get; set; }
+
+        public bool CheckOutEdit { get; set;}
+
+        public string Description { get; set; }
+    }
+}

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

@@ -0,0 +1,41 @@
+namespace BMA.EHR.Leave.Service.DTOs.AdditionalCheck
+{
+    public class GetAdditionalCheckRequestDto
+    {
+        public Guid Id { get; set; }
+
+        public string FullName { get; set; }
+
+        public DateTime CreatedAt { get; set; }
+
+        public DateTime CheckDate { get; set; }
+
+        public bool CheckInEdit { get; set; }
+
+        public bool CheckOutEdit { get; set; }
+
+        public string CheckInTime { get; set; }
+
+        public string CheckOutTime { get; set; }
+
+        public string? CheckInStatus { get; set; }
+
+        public string? CheckOutStatus { get; set; }
+
+        public string StartTimeMorning { get; set; }
+
+        public string EndTimeMorning { get; set; }
+
+        public string StartTimeAfternoon { get; set; }
+
+        public string EndTimeAfternoon { get; set; }
+
+        public string Reason { get; set; }
+
+        public string Status { get; set; }
+
+        public string Description { get; set; }
+
+        public int StatusSort { get; set; } = 0;
+    }
+}

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

@@ -0,0 +1,27 @@
+namespace BMA.EHR.Leave.Service.DTOs.AdditionalCheck
+{
+    public class GetAdditionalCheckRequestHistoryDto
+    {
+        public Guid Id { get; set; }
+
+        public DateTime? CheckInDate { get; set; }
+
+        public DateTime? CheckOutDate { get; set; }
+
+        public string CheckInTime { get; set; }
+
+        public string CheckOutTime { get; set; }
+
+        public string CheckInLocation { get; set; }
+
+        public string CheckOutLocation { get; set; }
+
+        public string? CheckInStatus { get; set; }
+
+        public string? CheckOutStatus { get; set; }
+
+        public string? EditReason { get; set; }
+
+        public string? EditStatus { get; set; }
+    }
+}

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

@@ -0,0 +1,7 @@
+namespace BMA.EHR.Leave.Service.DTOs.AdditionalCheck
+{
+    public class RejectRequestDto
+    {
+        public string Reason { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/Calendar/UpdateCalendarDto.cs

@@ -0,0 +1,7 @@
+namespace BMA.EHR.Leave.Service.DTOs.Calendar
+{
+    public class UpdateCalendarDto
+    {
+        public string Work { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/ChangeRound/ChangeRoundHistoryDto.cs

@@ -0,0 +1,16 @@
+namespace BMA.EHR.Leave.Service.DTOs.ChangeRound
+{
+    public class ChangeRoundHistoryDto
+    {
+        
+        public int Round { get; set; }
+
+        public string StartTimeMorning { get; set; }
+
+        public string LeaveTimeAfternoon { get; set; }
+
+        public DateTime EffectiveDate { get; set; }
+
+        public string Remark { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/ChangeRound/CreateChangeRoundDto.cs

@@ -0,0 +1,15 @@
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+
+namespace BMA.EHR.Leave.Service.DTOs.ChangeRound
+{
+    public class CreateChangeRoundDto
+    {
+        public Guid ProfileId { get; set; }
+
+        public Guid RoundId { get; set; }
+
+        public DateTime EffectiveDate { get; set; }
+
+        public string Remark { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileDto.cs

@@ -0,0 +1,17 @@
+namespace BMA.EHR.Leave.Service.DTOs.ChangeRound
+{
+    public class SearchProfileDto
+    {
+        public string? CitizenId { get; set; }
+
+        public string? FirstName { get; set; }
+
+        public string? LastName { get; set; }
+
+        public int Page { get; set; } = 1;
+
+        public int PageSize { get; set; } = 10;
+
+        public string? Keyword { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileResultDto.cs

@@ -0,0 +1,17 @@
+namespace BMA.EHR.Leave.Service.DTOs.ChangeRound
+{
+    public class SearchProfileResultDto
+    {
+        public Guid ProfileId { get; set; }
+
+        public string CitizenId { get; set; }
+
+        public string FullName { get; set; }    
+
+        public string StartTimeMorning { get; set; }
+
+        public string LeaveTimeAfterNoon { get;set; }
+
+        public DateTime? EffectiveDate { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/CheckInDetailForAdminDto.cs

@@ -0,0 +1,49 @@
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class CheckInDetailForAdminDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public DateTime? CheckInDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckInStatus { get; set; } = string.Empty;
+
+        public string? CheckInTime { get; set; } = "00:00";
+
+        public string? CheckInPOI { get; set; } = string.Empty;
+
+        public double? CheckInLat { get; set; } = 0;
+
+        public double? CheckInLon { get; set; } = 0;
+
+        public string? CheckInImg { get; set; } = string.Empty;
+
+        public string CheckInDescription { get; set; } = string.Empty;
+
+        public bool IsLocationCheckIn { get; set; } = true;
+
+        public string? CheckInLocationName { get; set; } = string.Empty;
+
+        public DateTime? CheckOutDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckOutStatus { get; set; } = string.Empty;
+
+        public string? CheckOutTime { get; set; } = "00:00";
+
+        public string? CheckOutPOI { get; set; } = string.Empty;
+
+        public double? CheckOutLat { get; set; } = 0;
+
+        public double? CheckOutLon { get; set; } = 0;
+
+        public string? CheckOutImg { get; set; } = string.Empty;
+
+        public string? CheckOutDescription { get; set; } = string.Empty;
+
+        public bool IsLocationCheckOut { get; set; } = true;
+
+        public string? CheckOutLocationName { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/CheckInHistoryDto.cs

@@ -0,0 +1,37 @@
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class CheckInHistoryDto
+    {
+        public Guid CheckInId { get; set; } = Guid.Empty;
+
+        public DateTime? CheckInDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckInTime { get; set; } = "00:00";
+
+        public string? CheckInLocation { get; set; } = string.Empty;
+
+        public string? CheckInStatus { get; set; } = string.Empty;
+
+        public bool CheckInIsLocation { get; set; } = false;
+
+        public string? CheckInLocationName { get; set; } = string.Empty;
+
+        public DateTime? CheckOutDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckOutTime { get; set; } = "00:00";
+
+        public string? CheckOutLocation { get; set; } = string.Empty;
+
+        public string? CheckOutStatus { get; set; } = string.Empty;
+
+        public bool CheckOutIsLocation { get; set; } = false;
+
+        public string? CheckOutLocationName { get; set; } = string.Empty;
+
+        //public string EditStatus { get; set; } = string.Empty;
+
+        //public string EditReason { get; set; } = string.Empty;
+
+        public bool IsEdit { get; set; } = false;
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/CheckInHistoryForAdminDto.cs

@@ -0,0 +1,41 @@
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class CheckInHistoryForAdminDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public DateTime? CheckInDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckInTime { get; set; } = "00:00";
+
+        public string? CheckInLocation { get; set; } = string.Empty;
+
+        public double? CheckInLat { get; set; } = 0;
+
+        public double? CheckInLon { get; set; } = 0;
+
+        public string? CheckInImage { get; set; } = string.Empty;
+
+        public bool IsLocationCheckIn { get; set; } = true;
+
+        public string? CheckInLocationName { get; set; } = string.Empty;
+
+        public DateTime? CheckOutDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckOutTime { get; set; } = "00:00";
+
+        public string? CheckOutLocation { get; set; } = string.Empty;
+
+        public double? CheckOutLat { get; set; } = 0;
+
+        public double? CheckOutLon { get; set; } = 0;
+
+        public string? CheckOutImage { get; set; } = string.Empty;
+
+        public bool IsLocationCheckOut { get; set; } = true;
+
+        public string? CheckOutLocationName { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/CheckInProcessHistoryForAdminDto.cs

@@ -0,0 +1,41 @@
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class CheckInProcessHistoryForAdminDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public DateTime? CheckInDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckInTime { get; set; } = "00:00";
+
+        public string? CheckInLocation { get; set; } = string.Empty;
+
+        public double? CheckInLat { get; set; } = 0;
+
+        public double? CheckInLon { get; set; } = 0;
+
+        public string? CheckInStatus { get; set; } = string.Empty;
+
+        public DateTime? CheckOutDate { get; set; } = DateTime.MinValue;
+
+        public string? CheckOutTime { get; set; } = "00:00";
+
+        public string? CheckOutLocation { get; set; } = string.Empty;
+
+        public double? CheckOutLat { get; set; } = 0;
+
+        public double? CheckOutLon { get; set; } = 0;
+
+        public string? CheckOutStatus { get; set; } = string.Empty;
+
+        public bool CheckInIsLocation { get; set; } = false;
+
+        public string? CheckInLocationName { get; set; } = string.Empty;
+
+        public bool CheckOutIsLocation { get; set; } = false;
+
+        public string? CheckOutLocationName { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/CheckInResultDto.cs

@@ -0,0 +1,19 @@
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class CheckInResultDto
+    {
+        public Guid? CheckInId { get; set; }
+
+        public DateTime? CheckInTime { get; set; }
+
+        public string Description { get; set; } = string.Empty;
+
+        public string StartTimeMorning { get; set; } = "00:00";
+
+        public string EndTimeMorning { get; set; } = "00:00";
+
+        public string StartTimeAfternoon { get; set; } = "00:00";
+
+        public string EndTimeAfternoon { get; set; } = "00:00";
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/CheckTimeDto.cs

@@ -0,0 +1,28 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class CheckTimeDto
+    {
+		public Guid? CheckInId { get; set; }
+
+		[Required]
+		public IFormFile? Img { get; set; }
+
+        [Required]
+        public double Lat { get; set; } = 0;
+
+        [Required]
+        public double Lon { get; set; } = 0;
+
+        [Required]
+        public string POI { get; set; } = string.Empty;
+
+        [Required]
+        public bool IsLocation { get; set; } = true;
+
+		public string? LocationName { get; set; } = string.Empty;
+
+		public string? Remark { get; set;} = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/CheckIn/EditCheckInStatusDto.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.CheckIn
+{
+    public class EditCheckInStatusDto
+    {
+        [Required]
+        public string CheckInStatus { get; set; } = string.Empty;
+
+        [Required]
+        public string CheckOutStatus { get; set; } = string.Empty;
+
+        public string? Reason { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/DutyTime/CreateDutyTimeDto.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.DutyTime
+{
+    public class CreateDutyTimeDto
+    {
+
+        [Comment("คำอธิบาย")]
+        public string? Description { get; set; } = string.Empty;
+
+        [Required, Comment("เวลาเข้างานช่วงเช้า")]
+        public string StartTimeMorning { get; set; } = "00:00";
+
+        [Required, Comment("เวลาออกงานช่วงเช้า")]
+        public string EndTimeMorning { get; set; } = "00:00";
+
+        [Required, Comment("เวลาเข้างานช่วงบ่าย")]
+        public string StartTimeAfternoon { get; set; } = "00:00";
+
+        [Required, Comment("เวลาออกงานช่วงบ่าย")]
+        public string EndTimeAfternoon { get; set; } = "00:00";
+
+        [Required, Comment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)")]
+        public bool IsDefault { get; set; } = false;
+
+        [Required, Comment("Is Active")]
+        public bool IsActive { get; set; } = false;
+    }
+}

BMA.EHR.Leave/DTOs/DutyTime/UpdateDutyTimeDto.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.DutyTime
+{
+    public class UpdateDutyTimeDto
+    {
+        [Comment("คำอธิบาย")]
+        public string? Description { get; set; } = string.Empty;
+
+        [Required, Comment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)")]
+        public bool IsDefault { get; set; } = false;
+
+        [Required, Comment("สถานะการเปิดใช้งาน (เปิด/ปิด)")]
+        public bool IsActive { get; set; } = true;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/CancelLeaveRequestApproveDto.cs

@@ -0,0 +1,7 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class CancelLeaveRequestApproveDto
+    {
+        public string? Reason { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/CancelLeaveRequestDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class CancelLeaveRequestDto
+    {
+        public string? Reason { get; set; }
+
+        public IFormFile? Doc { get; set; }
+
+        public string? LeaveWrote { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs

@@ -0,0 +1,101 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class CreateLeaveRequestDto
+    {
+        [Required]
+        public Guid Type { get; set; } = Guid.Empty;
+
+        [Required]
+        public DateTime LeaveStartDate { get; set; } = DateTime.Now;
+
+        [Required]
+        public DateTime LeaveEndDate { get; set; } = DateTime.Now;
+
+        public string? LeaveWrote { get; set; }
+
+        public string? LeaveRange { get; set; } = "ALL";
+
+        public double LeaveTotal { get; set; } = 0.0;
+
+        public string? LeaveAddress { get; set; }
+
+        public string? LeaveNumber { get; set; }
+
+        public string? LeaveDetail { get; set; }
+
+        public List<IFormFile> LeaveDocument { get; set; } = new();
+
+        public IFormFile? LeaveDraftDocument { get; set; }
+
+        public string? LeaveSalaryText { get; set; }
+
+        public string? WifeDayName { get; set; }
+
+        public string? WifeDayDateBorn { get; set; }
+
+        public int? RestDayOldTotal { get; set; }
+
+        public int? RestDayCurrentTotal { get; set; }
+
+        public bool? OrdainDayStatus { get; set; }
+
+        public string? OrdainDayLocationName { get; set; }
+
+        public string? OrdainDayLocationAddress { get; set; }
+
+        public string? OrdainDayLocationNumber { get; set; }
+
+        public DateTime? OrdainDayOrdination { get; set; }
+
+        public string? OrdainDayBuddhistLentName { get; set; }
+
+        public string? OrdainDayBuddhistLentAddress { get; set; }
+
+        public bool? HajjDayStatus { get; set; }
+
+        public string? AbsentDaySummon { get; set; }
+
+        public string? AbsentDayLocation { get; set; }
+
+        public DateTime? AbsentDayRegistorDate { get; set; }
+
+        public string? AbsentDayGetIn { get; set; }
+
+        public string? AbsentDayAt { get; set; }
+
+        public string? StudyDaySubject { get; set; }
+
+        public string? StudyDayDegreeLevel { get; set; }
+
+        public string? StudyDayUniversityName { get; set; }
+
+        public string? StudyDayTrainingSubject { get; set; }
+
+        public string? StudyDayTrainingName { get; set; }
+
+        public string? StudyDayCountry { get; set; }
+
+        public string? StudyDayScholarship { get; set; }
+
+        public string? CoupleDayName { get; set; }
+
+        public string? CoupleDayPosition { get; set; }
+
+        public string? CoupleDayLevel { get; set; }
+
+        public string? CoupleDayLevelCountry { get; set; }
+
+        public string? CoupleDayCountryHistory { get; set; }
+
+        public string? CoupleDayTotalHistory { get; set; }
+
+        public DateTime? CoupleDayStartDateHistory { get; set; }
+
+        public DateTime? CoupleDayEndDateHistory { get; set; }
+
+        public string? CoupleDaySumTotalHistory { get; set; }
+
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/DeleteLeaveDocumentDto.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class DeleteLeaveDocumentDto
+    {
+        [Required]
+        public Guid Id { get; set; } = Guid.Empty;
+
+        [Required]
+        public Guid DocId { get; set; } = Guid.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetCancelLeaveRequestByIdDto.cs

@@ -0,0 +1,31 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetCancelLeaveRequestByIdDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string LeaveTypeName { get; set; } = string.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public string Status { get; set; } = string.Empty;
+
+        public string LeaveDocDelete { get; set; } = string.Empty;
+
+        public string LeaveReasonDelete {  get; set; } = string.Empty;
+
+        public string LeaveWrote { get; set; } = string.Empty;
+
+        public string LeaveAddress { get; set; } = string.Empty;
+
+        public string LeaveNumber { get; set; } = string.Empty;
+
+        public string LeaveDetail { get; set; } = string.Empty;
+
+        public double LeaveTotal { get; set; } = 0;
+
+        public DateTime LeaveStartDate { get; set; } = DateTime.MinValue;
+
+        public DateTime LeaveEndDate { get; set;} = DateTime.MinValue;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveCancelRequestDto.cs

@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveCancelRequestDto
+    {
+        [Required]
+        public Guid Type { get; set; } = Guid.Empty;
+
+        [Required]
+        public string Status { get; set; } = string.Empty;
+
+        [Required]
+        public int Page { get; set; } = 1;
+
+        [Required]
+        public int PageSize { get; set; } = 10;
+
+        public string Keyword { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveCancelRequestResultDto.cs

@@ -0,0 +1,17 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveCancelRequestResultDto
+    {
+		public Guid Id { get; set; }
+
+		public string LeaveTypeName { get; set; }
+
+		public Guid LeaveTypeId { get; set; }
+
+		public string FullName { get; set; }
+
+		public DateTime DateSendLeave { get; set; }
+
+		public string Status { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveCheckDto.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveCheckDto
+    {
+        [Required]
+        public Guid Type { get; set; } = Guid.Empty;
+
+        [Required]
+        public DateTime StartLeaveDate { get; set; } = DateTime.MinValue;
+
+        [Required]
+        public DateTime EndLeaveDate { get; set;} = DateTime.MinValue;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveCheckResultDto.cs

@@ -0,0 +1,13 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveCheckResultDto
+    {
+        public bool IsLeave { get; set; } = false;
+
+        public double SumDateWork { get; set; } = 0;
+
+        public double TotalDate { get; set; } = 0;
+
+        public double SumDateHoliday { get; set; } = 0;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs

@@ -0,0 +1,128 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestByIdDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string LeaveTypeName { get; set; } = string.Empty;
+
+        public Guid LeaveTypeId { get; set; } = Guid.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public DateTime DateSendLeave { get; set; } = DateTime.MinValue;
+
+        public string Status { get; set; } = string.Empty;
+
+        public DateTime LeaveStartDate { get; set; } = DateTime.Now;
+
+        public DateTime LeaveEndDate { get; set; } = DateTime.Now;
+
+        public string LeaveWrote { get; set; } = string.Empty;
+
+        public string? LeaveRange { get; set; } = string.Empty;
+
+        public string LeaveAddress { get; set; } = string.Empty;
+
+        public string LeaveNumber { get; set; } = string.Empty;
+
+        public string LeaveDetail { get; set; } = string.Empty;
+
+        public List<LeaveDocumentDto> LeaveDocument { get; set; } = new();
+
+        public string LeaveDraftDocument { get; set; }
+
+        public DateTime? LeaveLastStart { get; set; } = DateTime.MinValue;
+
+        public DateTime? LeaveLastEnd { get; set; } = DateTime.MinValue;
+
+        public double LeaveTotal { get; set; } = 0;
+
+        public DateTime? LeaveBirthDate { get; set; } = DateTime.MinValue;
+
+        public DateTime? LeaveGovernmentDate { get; set; } = DateTime.MinValue;
+
+        public double LeaveSalary { get; set; } = 0;
+
+        public string LeaveSalaryText { get; set; } = string.Empty;
+
+        public string WifeDayName { get; set; } = string.Empty;
+
+        public string WifeDayDateBorn { get; set; } = string.Empty;
+
+        public double RestDayOldTotal { get; set; } = 0;
+
+        public double RestDayCurrentTotal { get; set; } = 0;
+
+        public bool OrdainDayStatus { get; set; } = false;
+
+        public string OrdainDayLocationName { get; set; } = string.Empty;
+
+        public string OrdainDayLocationAddress { get; set; } = string.Empty;
+
+        public string OrdainDayLocationNumber { get; set; } = string.Empty;
+
+        public DateTime OrdainDayOrdination { get; set; } = DateTime.Now;
+
+        public string OrdainDayBuddhistLentName { get; set; } = string.Empty;
+
+        public string OrdainDayBuddhistLentAddress { get; set; } = string.Empty;
+
+        public bool HajjDayStatus { get; set; } = false;
+
+        public string AbsentDaySummon { get; set; } = string.Empty;
+
+        public string AbsentDayLocation { get; set; } = string.Empty;
+
+        public DateTime AbsentDayRegistorDate { get; set; } = DateTime.Now;
+
+        public string AbsentDayGetIn { get; set; } = string.Empty;
+
+        public string AbsentDayAt { get; set; } = string.Empty;
+
+        public string StudyDaySubject { get; set; } = string.Empty;
+
+        public string StudyDayDegreeLevel { get; set; } = string.Empty;
+
+        public string StudyDayUniversityName { get; set; } = string.Empty;
+
+        public string StudyDayTrainingSubject { get; set; } = string.Empty;
+
+        public string StudyDayTrainingName { get; set; } = string.Empty;
+
+        public string StudyDayCountry { get; set; } = string.Empty;
+
+        public string StudyDayScholarship { get; set; } = string.Empty;
+
+        public string CoupleDayName { get; set; } = string.Empty;
+
+        public string CoupleDayPosition { get; set; } = string.Empty;
+
+        public string CoupleDayLevel { get; set; } = string.Empty;
+
+        public string CoupleDayLevelCountry { get; set; } = string.Empty;
+
+        public string CoupleDayCountryHistory { get; set; } = string.Empty;
+
+        public string CoupleDayTotalHistory { get; set; } = string.Empty;
+
+        public DateTime CoupleDayStartDateHistory { get; set; } = DateTime.Now;
+
+        public DateTime CoupleDayEndDateHistory { get; set; } = DateTime.Now;
+
+        public string CoupleDaySumTotalHistory { get; set; } = string.Empty;
+
+        public string? Dear { get; set; } = string.Empty;
+
+        public string? LeaveTypeCode { get; set; } = string.Empty;
+
+        public string? PositionName { get; set; } = string.Empty;
+
+        public string? PositionLevelName { get; set; } = string.Empty;
+
+        public string? OrganizationName { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarDto.cs

@@ -0,0 +1,7 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestCalendarDto
+    {
+        public int Year { get; set; } = DateTime.Now.Year;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs

@@ -0,0 +1,23 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestCalendarResultDto
+    {
+        public Guid Id { get; set; }
+
+        public string LeaveTypeName { get; set; }
+
+        public Guid LeaveTypeId { get; set; }
+
+        public DateTime DateSendLeave { get; set; }
+
+        public string Status { get; set; }
+
+        public string FullName { get; set; }
+
+        public DateTime LeaveStartDate { get; set; }
+
+        public DateTime LeaveEndDate { get; set; }
+
+        public Guid KeycloakId { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs

@@ -0,0 +1,137 @@
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestForAdminByIdDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string? ReasonCommander { get; set; }
+
+        public string? ReasonOligarch { get; set; }
+
+        public string? PositionName { get; set; }
+
+        public string? PositionLevelName { get; set; }
+
+        public string? OrganizationName { get; set; }
+
+        public string LeaveTypeName { get; set; } = string.Empty;
+
+        public Guid LeaveTypeId { get; set; } = Guid.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public DateTime DateSendLeave { get; set; } = DateTime.MinValue;
+
+        public string Status { get; set; } = string.Empty;
+
+        public DateTime LeaveStartDate { get; set; } = DateTime.Now;
+
+        public DateTime LeaveEndDate { get; set; } = DateTime.Now;
+
+        public string LeaveWrote { get; set; } = string.Empty;
+
+        public string LeaveAddress { get; set; } = string.Empty;
+
+        public string LeaveNumber { get; set; } = string.Empty;
+
+        public string LeaveDetail { get; set; } = string.Empty;
+
+        public List<LeaveDocumentDto> LeaveDocument { get; set; } = new();
+
+        public string LeaveDraftDocument { get; set; }
+
+        public DateTime? LeaveLastStart { get; set; } = DateTime.MinValue;
+
+        public DateTime? LeaveLastEnd { get; set; } = DateTime.MinValue;
+
+        public double LeaveTotal { get; set; } = 0;
+
+        public DateTime? LeaveBirthDate { get; set; } = DateTime.MinValue;
+
+        public DateTime? LeaveGovernmentDate { get; set; } = DateTime.MinValue;
+
+        public double LeaveSalary { get; set; } = 0;
+
+        public string LeaveSalaryText { get; set; } = string.Empty;
+
+        public string WifeDayName { get; set; } = string.Empty;
+
+        public string WifeDayDateBorn { get; set; } = string.Empty;
+
+        public double RestDayOldTotal { get; set; } = 0;
+
+        public double RestDayCurrentTotal { get; set; } = 0;
+
+        public bool OrdainDayStatus { get; set; } = false;
+
+        public string OrdainDayLocationName { get; set; } = string.Empty;
+
+        public string OrdainDayLocationAddress { get; set; } = string.Empty;
+
+        public string OrdainDayLocationNumber { get; set; } = string.Empty;
+
+        public DateTime OrdainDayOrdination { get; set; } = DateTime.Now;
+
+        public string OrdainDayBuddhistLentName { get; set; } = string.Empty;
+
+        public string OrdainDayBuddhistLentAddress { get; set; } = string.Empty;
+
+        public bool HajjDayStatus { get; set; } = false;
+
+        public string AbsentDaySummon { get; set; } = string.Empty;
+
+        public string AbsentDayLocation { get; set; } = string.Empty;
+
+        public DateTime AbsentDayRegistorDate { get; set; } = DateTime.Now;
+
+        public string AbsentDayGetIn { get; set; } = string.Empty;
+
+        public string AbsentDayAt { get; set; } = string.Empty;
+
+        public string StudyDaySubject { get; set; } = string.Empty;
+
+        public string StudyDayDegreeLevel { get; set; } = string.Empty;
+
+        public string StudyDayUniversityName { get; set; } = string.Empty;
+
+        public string StudyDayTrainingSubject { get; set; } = string.Empty;
+
+        public string StudyDayTrainingName { get; set; } = string.Empty;
+
+        public string StudyDayCountry { get; set; } = string.Empty;
+
+        public string StudyDayScholarship { get; set; } = string.Empty;
+
+        public string CoupleDayName { get; set; } = string.Empty;
+
+        public string CoupleDayPosition { get; set; } = string.Empty;
+
+        public string CoupleDayLevel { get; set; } = string.Empty;
+
+        public string CoupleDayLevelCountry { get; set; } = string.Empty;
+
+        public string CoupleDayCountryHistory { get; set; } = string.Empty;
+
+        public string CoupleDayTotalHistory { get; set; } = string.Empty;
+
+        public DateTime CoupleDayStartDateHistory { get; set; } = DateTime.Now;
+
+        public DateTime CoupleDayEndDateHistory { get; set; } = DateTime.Now;
+
+        public string CoupleDaySumTotalHistory { get; set; } = string.Empty;
+
+        public string Dear { get; set; } = string.Empty;
+
+        public string ApproveStep { get; set; } = string.Empty;
+
+        public double LeaveLimit { get; set; } = 0;
+
+        public double LeaveSummary { get; set; } = 0;
+
+        public double LeaveRemain { get; set; } = 0;
+
+        public string LeaveRange { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminDto.cs

@@ -0,0 +1,29 @@
+using Org.BouncyCastle.Asn1.X509;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestForAdminDto
+    {
+        [Required]
+        public int Year { get; set; } = 0;
+
+        [Required]
+        public Guid Type { get; set; } = Guid.Empty;
+
+        [Required]
+        public string Status { get; set; } = string.Empty;
+
+        [Required]
+        public int Page { get; set; } = 1;
+
+        [Required]
+        public int PageSize { get; set; } = 10;
+
+        public string Keyword { get; set; } = string.Empty;
+
+        public DateTime StartDate { get; set; } = DateTime.MinValue;
+
+        public DateTime EndDate { get; set; } = DateTime.MinValue;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs

@@ -0,0 +1,33 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestForAdminResultDto
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string LeaveTypeName { get; set; } = string.Empty;
+
+        public Guid LeaveTypeId { get; set; } = Guid.Empty;
+
+        public string FullName { get; set; } = string.Empty;
+
+        public DateTime DateSendLeave { get; set; } = DateTime.MinValue;
+
+        public string Status { get; set; } = string.Empty;
+
+        public string CitizenId { get; set; } = string.Empty;
+
+        public DateTime LeaveStartDate { get; set; } = DateTime.MinValue;
+
+        public DateTime LeaveEndDate { get; set; } = DateTime.MinValue;
+
+        public string Agency { get; set; } = string.Empty;
+
+        public string Org { get; set; } = string.Empty;
+
+        public string Position { get; set; } = string.Empty;
+
+        public string Level { get; set; } = string.Empty;
+
+        public string LeaveRange { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableDto.cs

@@ -0,0 +1,24 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestTableDto
+    {
+        [Required]
+        public int Year { get; set; } = 0;
+
+        [Required]
+        public Guid Type { get; set; } = Guid.Empty;
+
+        [Required]
+        public string Status { get; set; } = "ALL";
+
+        [Required]
+        public int Page = 1;
+
+        [Required]
+        public int PageSize = 10;
+
+        public string? Keyword { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs

@@ -0,0 +1,23 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveRequestTableResultDto
+    {
+        public Guid Id { get; set; }
+
+        public string LeaveTypeName { get; set; }
+
+        public Guid LeaveTypeId { get; set; }
+
+        public string FullName { get; set; }
+
+        public DateTime DateSendLeave { get; set; }
+
+        public string Status { get; set; }
+
+        public bool IsDelete { get; set; }
+
+        public DateTime LeaveStartDate { get; set; } = DateTime.Now;
+
+        public DateTime LeaveEndDate { get; set; } = DateTime.Now;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveSummaryDto.cs

@@ -0,0 +1,9 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetLeaveSummaryDto
+    {
+        public DateTime StartDate { get; set; }
+
+        public DateTime EndDate { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileDto.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetUserLeaveProfileDto
+    {
+        [Required]
+        public Guid Type { get; set; } = Guid.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs

@@ -0,0 +1,37 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class GetUserLeaveProfileResultDto
+    {
+        public DateTime DateSendLeave { get; set; }
+
+        public string LeaveTypeName { get; set; }
+
+        public string Dear { get; set; }
+
+        public string FullName { get; set; }
+
+        public string PositionName { get; set; }
+
+        public string PositionLevelName { get; set; }
+
+        public string OrganizationName { get; set; }
+
+        public double LeaveLimit { get; set; }
+
+        public double LeaveTotal { get; set; }
+
+        public double LeaveRemain { get; set; }
+
+        public double RestDayTotalOld { get; set; }
+
+        public DateTime BirthDate { get; set; }
+
+        public DateTime? DateAppoint { get; set; }
+
+        public int Salary { get; set; }
+
+        public string SalaryText { get; set; }
+
+        public DateTime? LeaveLast { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/LeaveDocumentDto.cs

@@ -0,0 +1,9 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class LeaveDocumentDto
+    {
+        public Guid DocId { get; set; } = Guid.Empty;
+
+        public string Path { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/LeaveRequest/LeaveRequestApproveDto.cs

@@ -0,0 +1,7 @@
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    public class LeaveRequestApproveDto
+    {
+        public string? Reason { get; set; }
+    }
+}

BMA.EHR.Leave/DTOs/LeaveTypes/CreateLeaveTypeDto.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveTypes
+{
+    public class CreateLeaveTypeDto
+    {
+        [Required]
+        public Guid Id { get; set; } = Guid.Empty;
+
+        [Required]
+        public string Name { get; set; } = string.Empty;
+
+        [Required]
+        public string Code { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/POI/GetPOIDto.cs

@@ -0,0 +1,9 @@
+namespace BMA.EHR.Leave.Service.DTOs.POI
+{
+    public class GetPOIDto
+    {
+        public double Lat { get; set; } = 0;
+
+        public double Lon { get; set; } = 0;
+    }
+}

BMA.EHR.Leave/DTOs/POI/GetPOIResultDto.cs

@@ -0,0 +1,28 @@
+namespace BMA.EHR.Leave.Service.DTOs.POI
+{
+    public class GetPOIResultDto
+    {
+        public List<POIItem> results { get; set; } = new List<POIItem>();
+    }
+
+    public class POIItem
+    {
+        public string place_id { get; set; } = string.Empty;
+
+        public string name { get; set; } = string.Empty;
+
+        public GeometryItem geometry { get; set; } = new();
+    }
+
+    public class GeometryItem
+    {
+        public LocationItem location { get; set; } = new();
+    }
+
+    public class LocationItem
+    {
+        public double lat { get; set; } = 0;
+
+        public double lng { get; set; } = 0;
+    }
+}

BMA.EHR.Leave/DTOs/POI/POIResultDto.cs

@@ -0,0 +1,13 @@
+namespace BMA.EHR.Leave.Service.DTOs.POI
+{
+    public class POIResultDto
+    {
+        public string Id { get; set; } = string.Empty;
+
+        public string Name { get; set; } = string.Empty;
+
+        public double Latitude { get; set; } = 0;
+
+        public double Longitude { get; set; } = 0;
+    }
+}

BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailReportDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Leave.Service.DTOs.Reports
+{
+    public class GetLeaveDetailReportDto
+    {
+        public DateTime StartDate { get; set; } = DateTime.MinValue;
+
+        public DateTime EndDate { get; set; } = DateTime.MinValue;
+
+        public string Type { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave/DTOs/Reports/GetLeaveReportDto.cs

@@ -0,0 +1,12 @@
+namespace BMA.EHR.Leave.Service.DTOs.Reports
+{
+    public class GetLeaveReportDto
+    {
+        public string? Type { get; set; } = "FULL";
+
+        public DateTime StartDate { get; set; } = DateTime.MinValue;
+
+        public DateTime EndDate { get; set; } = DateTime.MinValue;
+
+    }
+}