Merge branch 'develop' into adiDev

2025-05-02 13:49:42 +07:00 · 2025-05-02 13:49:42 +07:00 · f96aa09cc7
commit f96aa09cc7
parent ff89c2c791 249911b931
17 changed files with 314 additions and 214 deletions
--- a/BMA.EHR.Application/BMA.EHR.Application.csproj
+++ b/BMA.EHR.Application/BMA.EHR.Application.csproj
@ -4,6 +4,9 @@
 		<TargetFramework>net6.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
+
 	</PropertyGroup>

 	<ItemGroup>
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@ -308,6 +308,33 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
            return await rawData.ToListAsync();
        }

+        public async Task<List<LeaveRequest>> GetLeaveRequestForAdminWithAuthAsync(int year, Guid type, string status, DateTime startDate, DateTime endDate,List<Guid> keycloakIdList)
+        {
+            var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
+                                    .Include(x => x.Type)
+                                    .Where(x => keycloakIdList.Contains(x.KeycloakUserId))
+                                    .Where(x => x.LeaveStatus != "DRAFT")
+                                    .OrderByDescending(x => x.CreatedAt)
+                                    .AsQueryable();
+
+            if (year != 0)
+                rawData = rawData.Where(x => x.LeaveStartDate.Year == year);
+
+            if (type != Guid.Empty)
+                rawData = rawData.Where(x => x.Type.Id == type);
+
+            if (status.Trim().ToUpper() != "ALL")
+                rawData = rawData.Where(x => x.LeaveStatus == status);
+
+            if (startDate != DateTime.MinValue)
+                rawData = rawData.Where(x => x.LeaveStartDate >= startDate);
+
+            if (endDate != DateTime.MinValue)
+                rawData = rawData.Where(x => x.LeaveEndDate <= endDate);
+
+            return await rawData.ToListAsync();
+        }
+
        public async Task<double> GetRestDayTotalByYearForUserAsync(Guid keycloakUserId, int year)
        {
            var startFiscalDate = new DateTime(year - 1, 10, 1);
@ -425,7 +452,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
            return await rawData.ToListAsync();
        }

-        public async Task<LeaveRequest> ApproveCancelLeaveRequestAsync(LeaveRequest data, string Reason)
+        public async Task<LeaveRequest> ApproveCancelLeaveRequestAsync(LeaveRequest data, string Reason,string LeaveReason)
        {
            try
            {
@ -438,6 +465,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests

                data.LeaveCancelStatus = "APPROVE";
                data.LeaveDirectorComment = Reason;
+                data.LeaveCancelComment = LeaveReason;

                // TODO : Update ไปตาราง beginning
                if (data.ApproveStep == "st4") // ถ้ามีการอนุมัติจากผู้มีอำนาจแล้ว
--- a/BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj
+++ b/BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj
@ -1,25 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-  </ItemGroup>
+	</PropertyGroup>

-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+		<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="appsettings.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>

 </Project>
--- a/BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj
+++ b/BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj
@ -9,6 +9,9 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerfileContext>.</DockerfileContext>
 		<RootNamespace>BMA.EHR.Command.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
+
 	</PropertyGroup>

 	<ItemGroup>
--- a/BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj
+++ b/BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj
@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>9d934a68-d1dd-449d-bde0-3078a774ad0f</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerfileContext>.</DockerfileContext>
-    <RootNamespace>BMA.EHR.Discipline.Service</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>9d934a68-d1dd-449d-bde0-3078a774ad0f</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.Discipline.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
+	</PropertyGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Hangfire" Version="1.8.5" />
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
 		<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
@ -36,10 +39,10 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
+	</ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>

 </Project>
--- a/BMA.EHR.Domain/BMA.EHR.Domain.csproj
+++ b/BMA.EHR.Domain/BMA.EHR.Domain.csproj
@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.9" />
-    <PackageReference Include="NEST" Version="7.17.5" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="ThaiBahtText" Version="1.0.103" />
-  </ItemGroup>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.9" />
+		<PackageReference Include="NEST" Version="7.17.5" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="ThaiBahtText" Version="1.0.103" />
+	</ItemGroup>

 </Project>
--- a/BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj
+++ b/BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj
@ -1,41 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.7.201.7" />
-    <PackageReference Include="EPPlus" Version="6.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
-    <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.9" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-  </ItemGroup>
+	</PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\BMA.EHR.Application\BMA.EHR.Application.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AWSSDK.S3" Version="3.7.201.7" />
+		<PackageReference Include="EPPlus" Version="6.2.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+		<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
+		<PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.9" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
+		<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
+	</ItemGroup>

-  <ItemGroup>
-    <None Update="SeedCommand.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Application\BMA.EHR.Application.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="SeedCommand.xlsx">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>

 </Project>
--- a/BMA.EHR.Insignia/BMA.EHR.Insignia.csproj
+++ b/BMA.EHR.Insignia/BMA.EHR.Insignia.csproj
@ -1,53 +1,56 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <UserSecretsId>93677512-b64b-4a19-9e7d-dd283c7ec901</UserSecretsId>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <GenerateDocumentationFile>True</GenerateDocumentationFile>
-        <DockerfileContext>.</DockerfileContext>
-        <RootNamespace>BMA.EHR.Insignia.Service</RootNamespace>
-        <AssemblyName>BMA.EHR.Insignia</AssemblyName>
-    </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>93677512-b64b-4a19-9e7d-dd283c7ec901</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.Insignia.Service</RootNamespace>
+		<AssemblyName>BMA.EHR.Insignia</AssemblyName>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-    <ItemGroup>
-        <PackageReference Include="Hangfire" Version="1.8.5" />
-        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
-        <PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.32.0" />
-        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-        <PackageReference Include="NEST" Version="7.17.5" />
-        <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-        <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" />
-        <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
-        <PackageReference Include="Sentry.AspNetCore" Version="3.33.1" />
-        <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
-        <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
-        <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-        <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    </ItemGroup>
+	</PropertyGroup>

-    <ItemGroup>
-        <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="Templates/PersonInsignia.xlsx">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Hangfire" Version="1.8.5" />
+		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
+		<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.32.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+		<PackageReference Include="NEST" Version="7.17.5" />
+		<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
+		<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" />
+		<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+		<PackageReference Include="Sentry.AspNetCore" Version="3.33.1" />
+		<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
+		<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
+		<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="Templates/PersonInsignia.xlsx">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 </Project>
--- a/BMA.EHR.Leave/BMA.EHR.Leave.csproj
+++ b/BMA.EHR.Leave/BMA.EHR.Leave.csproj
@ -11,7 +11,8 @@
 		<RootNamespace>BMA.EHR.Leave.Service</RootNamespace>
 		<AssemblyName>BMA.EHR.Leave</AssemblyName>

-		<NoWarn>$(NoWarn);</NoWarn>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

 	</PropertyGroup>

--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@ -282,8 +282,13 @@ namespace BMA.EHR.Leave.Service.Controllers

            //var sumWeekend = _holidayRepository.GetWeekEndCount(data.LeaveStartDate.Date, data.LeaveEndDate.Date, category);

+            var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1);
+            var endFiscalYear = data.CreatedAt.Date.AddDays(-1); // นับจากวันที่ยื่นลา
+
            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(data.LeaveStartDate.Year, data.Type.Id, data.KeycloakUserId);
-            var sumLeave = leaveData == null ? 0 : leaveData.LeaveDaysUsed;
+            //var sumLeave = leaveData == null ? 0 : leaveData.LeaveDaysUsed;
+
+            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);


            var leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
@ -314,13 +319,16 @@ namespace BMA.EHR.Leave.Service.Controllers

                    leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
                    leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
-                    leaveTotal = data.LeaveTotal.ToString().ToThaiNumber(),
-                    //LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
+                                
                    leaveAddress = data.LeaveAddress.ToThaiNumber(),
                    leaveNumber = data.LeaveNumber.ToThaiNumber(),
-
-                    LeaveSummary = sumLeave.ToString().ToThaiNumber(),
                    LeaveRemain = (leaveLimit - sumLeave).ToString().ToThaiNumber(),
+
+                    leaveTotal = data.LeaveTotal.ToString().ToThaiNumber(), // วันลาปัจจุบัน
+                    LeaveSummary = sumLeave.ToString().ToThaiNumber(), // วันลาครั้งก่อน
+                   
+                    LeaveAll = (data.LeaveTotal + sumLeave).ToString().ToThaiNumber(), // ลาครั้งนี้ + ครั้งก่อน
+                    LeaveLimit = leaveLimit.ToString().ToThaiNumber() // สิทธิ์การลา
                }
            };
        }
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@ -3,6 +3,7 @@ using BMA.EHR.Application.Repositories.Commands;
 using BMA.EHR.Application.Repositories.Leaves.LeaveRequests;
 using BMA.EHR.Application.Repositories.Leaves.TimeAttendants;
 using BMA.EHR.Application.Repositories.MetaData;
+using BMA.EHR.Application.Responses.Profiles;
 using BMA.EHR.Domain.Common;
 using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Domain.Models.Leave.Commons;
@ -1552,7 +1553,27 @@ namespace BMA.EHR.Leave.Service.Controllers
            {
                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
            }
-            var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate);
+
+            // เพิ่มเติมการดึงคนตามสิทธิ์แบบที่ bright ทำ #1462
+            var profileList = new List<GetProfileByKeycloakIdRootDto>();
+            if (req.ProfileType.Trim().ToUpper() == "OFFICER")
+            {
+
+                profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllOfficerAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
+            }
+            else
+            {
+
+                profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllEmployeeAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
+            }
+
+            var keycloakList = new List<Guid>();
+            if(profileList != null)
+            {
+                keycloakList = profileList.Where(x => x.Keycloak != null).Select(x => x.Keycloak!.Value).ToList();
+            }
+
+            var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminWithAuthAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, keycloakList);

            var result = new List<GetLeaveRequestForAdminResultDto>();

@ -1650,7 +1671,7 @@ namespace BMA.EHR.Leave.Service.Controllers
            }
            else
            {
-                data = await _leaveRequestRepository.ApproveCancelLeaveRequestAsync(data, "อนุมัติการขอยกเลิกการลา โดยระบบ");
+                data = await _leaveRequestRepository.ApproveCancelLeaveRequestAsync(data, "อนุมัติการขอยกเลิกการลา โดยระบบ", req.Reason ?? "");
            }

            // upload leave cancel document
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminDto.cs
@ -28,5 +28,11 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest

        public string ProfileType { get; set; } = string.Empty;

+        public string NodeId { get; set; } = string.Empty;
+
+        public int Node { get; set; } 
+
+        public string? RevisionId { get; set; } = string.Empty;
+
    }
 }
--- a/BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj
+++ b/BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj
@ -9,10 +9,13 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerfileContext>.</DockerfileContext>
 		<RootNamespace>BMA.EHR.MetaData.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
+
 	</PropertyGroup>

 	<ItemGroup>
-		
+
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
--- a/BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj
+++ b/BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj
@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>3d68209a-41b1-4d00-914e-b895d74467c0</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerfileContext>.</DockerfileContext>
-    <RootNamespace>BMA.EHR.OrganizationEmployee.Service</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>3d68209a-41b1-4d00-914e-b895d74467c0</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.OrganizationEmployee.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
+	</PropertyGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
@ -33,10 +36,10 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
+	</ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>

 </Project>
--- a/BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj
+++ b/BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj
@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>9d934a68-d1dd-449d-bde0-3078a774ad0f</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerfileContext>.</DockerfileContext>
-    <RootNamespace>BMA.EHR.Placement.Service</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>9d934a68-d1dd-449d-bde0-3078a774ad0f</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.Placement.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
+	</PropertyGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Hangfire" Version="1.8.5" />
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
 		<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
@ -36,10 +39,10 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
+	</ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>

 </Project>
--- a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj
+++ b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj
@ -9,20 +9,23 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerfileContext>.</DockerfileContext>
 		<RootNamespace>BMA.EHR.Report.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
+
 	</PropertyGroup>

 	<ItemGroup>
-	  <Compile Remove="Controllers\ReportDesignerController.cs" />
+		<Compile Remove="Controllers\ReportDesignerController.cs" />
 	</ItemGroup>

 	<ItemGroup>
-	  <Content Remove="runtimeconfig.template.json" />
+		<Content Remove="runtimeconfig.template.json" />
 	</ItemGroup>

 	<ItemGroup>
-	  <None Include="runtimeconfig.template.json" />
+		<None Include="runtimeconfig.template.json" />
 	</ItemGroup>
-	
+
 	<ItemGroup>
 		<PackageReference Include="iTextSharp" Version="5.5.13.3" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
@ -49,15 +52,15 @@
 		<PackageReference Include="Telerik.Reporting.OpenXmlRendering" Version="17.1.23.718" />

 	</ItemGroup>
-	
+
 	<ItemGroup>
-	  <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
 	</ItemGroup>
-	
+
 	<ItemGroup>
-	  <Content Update="nuget.config">
-	    <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-	  </Content>
+		<Content Update="nuget.config">
+			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
 	</ItemGroup>

 	<ItemGroup>
@ -157,10 +160,10 @@
 		<None Update="Reports\14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-        <None Update="Reports\14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล และ ผู้บังคับบัญชา-1.trdp">
+		<None Update="Reports\14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล และ ผู้บังคับบัญชา-1.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-        <None Update="Reports\14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล และ ผู้บังคับบัญชา-2.trdp">
+		<None Update="Reports\14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล และ ผู้บังคับบัญชา-2.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp">
@ -200,22 +203,22 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\20-คำสั่งจ้างและแต่งตั้งลูกจ้างประจำ.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-1.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-3.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-4.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\26-หนังสือถึงสถาบันพัฒนาข้าราชการ-1.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-1.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -248,22 +251,22 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\29-คำสั่งให้ช่วยราชการ-1.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\29-คำสั่งให้ช่วยราชการ-2.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\31-ประกาศเกษียณข้าราชการ-1.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\31-ประกาศเกษียณข้าราชการ-2.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\31-ประกาศเกษียณข้าราชการ-3.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\31-ประกาศเกษียณข้าราชการ.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -302,19 +305,19 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\37-คำสั่งปลดออกจากราชการ.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\37-คำสั่งให้ออกจากราชการ.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\38-คำสั่งลงโทษไล่ข้าราชการออกจากราชการ.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\38-คำสั่งลงโทษไล่ลูกจ้างออกจากราชการ-1.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\38-คำสั่งลงโทษไล่ลูกจ้างออกจากราชการ-2.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\39-แบบ ขร1 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นสายสะพาย.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -326,7 +329,7 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\41-แบบ ขร3 บัญชีรายชื่อข้าราชการผู้ขอพระราชทานเครื่องราชฯ_Back.trdp">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="Reports\42-แบบ ขร4 บัญชีแสดงคุณสมบัติของข้าราชการซึ่งเสนอขอเครื่องราชฯ.trdp">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj
+++ b/BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj
@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>7be0011e-a539-4e0e-a300-ed7f11163989</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerfileContext>.</DockerfileContext>
-    <RootNamespace>BMA.EHR.Retirement.Service</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>7be0011e-a539-4e0e-a300-ed7f11163989</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.Retirement.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>

-  <ItemGroup>
+	</PropertyGroup>
+
+	<ItemGroup>
 		<PackageReference Include="AWSSDK.S3" Version="3.7.201.7" />
 		<PackageReference Include="Hangfire" Version="1.8.5" />
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
@ -37,10 +40,10 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
+	</ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>

 </Project>