Merge branch 'develop' into working

BMA.EHR.Domain/Models/HR/Profile.cs

@@ -179,21 +179,25 @@ namespace BMA.EHR.Domain.Models.HR
         public string? PositionExecutiveSide { get; set; }
 
         [Comment("Id ตำแหน่ง")]
-        public Guid? PositionEmployeePositionId { get; set; }
+        public PositionEmployeePosition? PositionEmployeePosition { get; set; }
-        [Comment("ตำแหน่ง")]
+        // [Comment("ตำแหน่ง")]
-        public string? PositionEmployeePosition { get; set; }
+        // public string? PositionEmployeePosition { get; set; }
         [Comment("Id ด้านของตำแหน่ง")]
-        public Guid? PositionEmployeePositionSideId { get; set; }
+        public PositionEmployeePositionSide? PositionEmployeePositionSide { get; set; }
-        [Comment("ด้านของตำแหน่ง")]
+        // [Comment("ด้านของตำแหน่ง")]
-        public string? PositionEmployeePositionSide { get; set; }
+        // public string? PositionEmployeePositionSide { get; set; }
         [Comment(" Id ระดับชั้นงาน")]
-        public Guid? PositionEmployeeLevelId { get; set; }
+        public PositionEmployeeLevel? PositionEmployeeLevel { get; set; }
-        [Comment("ระดับชั้นงาน")]
+        // [Comment("ระดับชั้นงาน")]
-        public string? PositionEmployeeLevel { get; set; }
+        // public string? PositionEmployeeLevel { get; set; }
         [Comment("Id กลุ่มงาน")]
-        public Guid? PositionEmployeeGroupId { get; set; }
+        public PositionEmployeeGroup? PositionEmployeeGroup { get; set; }
-        [Comment("กลุ่มงาน")]
+        // [Comment("กลุ่มงาน")]
-        public string? PositionEmployeeGroup { get; set; }
+        // public string? PositionEmployeeGroup { get; set; }
+        [Comment("Id สายงาน")]
+        public PositionEmployeeLine? PositionEmployeeLine { get; set; }
+        // [Comment("สายงาน")]
+        // public string? PositionEmployeeLine { get; set; }
 
         [MaxLength(100), Comment("สถานภาพทางกาย")]
         public string Physical { get; set; }
@@ -257,6 +261,20 @@ namespace BMA.EHR.Domain.Models.HR
         // public OrganizationPositionEntity? OrganizationPosition { get; set; }
         public LimitLeave? LimitLeave { get; set; }
         public Guid? KeycloakId { get; set; }
+        [Comment("สังกัด")]
+        public string? EmployeeOc { get; set; }
+        [Comment("ค่าจ้าง")]
+        public string? EmployeeWage { get; set; }
+        [Comment("ประเภทบุคคล")]
+        public string? EmployeeTypeIndividual { get; set; }
+        [Comment("เงินเพิ่มการครองชีพชั่วคราว")]
+        public double? EmployeeMoneyIncrease { get; set; }
+        [Comment("เงินช่วยเหลือค่าครองชีพชั่วคราว")]
+        public double? EmployeeMoneyAllowance { get; set; }
+        [Comment("เงินสมทบประกันสังคม(ลูกจ้าง)")]
+        public double? EmployeeMoneyEmployee { get; set; }
+        [Comment("เงินสมทบประกันสังคม(นายจ้าง)")]
+        public double? EmployeeMoneyEmployer { get; set; }
 
         public virtual List<ProfileEducation> Educations { get; set; } = new List<ProfileEducation>();
 

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

@@ -66,9 +66,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             p.CreatedAt,
                             p.Organization,
                             p.Reason,
@@ -112,9 +112,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,

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

@@ -154,22 +154,22 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.PositionNumberOld,
                             p.OrganizationPositionOld,
                             Avatar = p.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Avatar.Id,
-                            // PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
+                            PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
                         })
                        .FirstOrDefaultAsync();
             if (data == null)
                 return Error(GlobalMessages.DataNotFound, 404);
 
-            // var placementReceiveDocs = new List<dynamic>();
+            var placementReceiveDocs = new List<dynamic>();
-            // foreach (var doc in data.PlacementReceiveDocs)
+            foreach (var doc in data.PlacementReceiveDocs)
-            // {
+            {
-            //     var _doc = new
+                var _doc = new
-            //     {
+                {
-            //         doc.FileName,
+                    doc.FileName,
-            //         PathName = await _documentService.ImagesPath(doc.Id)
+                    PathName = await _documentService.ImagesPath(doc.Id)
-            //     };
+                };
-            //     placementReceiveDocs.Add(_doc);
+                placementReceiveDocs.Add(_doc);
-            // }
+            }
             var _data = new
             {
                 data.Id,
@@ -206,7 +206,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 data.PositionNumberOld,
                 data.OrganizationPositionOld,
                 Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
-                // Docs = placementReceiveDocs,
+                Docs = placementReceiveDocs,
             };
 
             return Success(_data);
@@ -302,6 +302,68 @@ namespace BMA.EHR.Placement.Service.Controllers
             return Success();
         }
 
+        /// <summary>
+        /// อัพไฟล์เอกสาร
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("upload/{id:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> PostFile([FromForm] PlacementFileRequest req, Guid id)
+        {
+            var uppdated = await _context.PlacementReceives
+                            .Include(x => x.PlacementReceiveDocs)
+                            .ThenInclude(x => x.Document)
+                            .FirstOrDefaultAsync(x => x.Id == id);
+            if (uppdated == null)
+                return Error(GlobalMessages.PlacementReceiveNotFound, 404);
+
+            var placementReceiveDocs = new List<dynamic>();
+            foreach (var doc in uppdated.PlacementReceiveDocs)
+            {
+                if (doc.Document != null)
+                    placementReceiveDocs.Add(doc.Document.Id);
+            }
+            _context.PlacementReceiveDocs.RemoveRange(uppdated.PlacementReceiveDocs);
+            await _context.SaveChangesAsync();
+            foreach (var doc in placementReceiveDocs)
+            {
+                if (doc != null)
+                    await _documentService.DeleteFileAsync(doc);
+            }
+
+            if (Request.Form.Files != null && Request.Form.Files.Count != 0)
+            {
+                foreach (var file in Request.Form.Files)
+                {
+                    var fileExtension = Path.GetExtension(file.FileName);
+                    var doc = await _documentService.UploadFileAsync(file, file.FileName);
+                    var _doc = await _context.Documents.AsQueryable()
+                                        .FirstOrDefaultAsync(x => x.Id == doc.Id);
+                    if (_doc != null)
+                    {
+                        var placementReceiveDoc = new PlacementReceiveDoc
+                        {
+                            PlacementReceive = uppdated,
+                            Document = _doc,
+                            CreatedUserId = FullName ?? "",
+                            CreatedFullName = UserId ?? "System Administrator",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        };
+                        await _context.PlacementReceiveDocs.AddAsync(placementReceiveDoc);
+                    }
+                }
+            }
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
+
         /// <summary>
         /// เลือกหน่วยงาน
         /// </summary>

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

@@ -66,9 +66,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             p.CreatedAt,
                             p.Organization,
                             p.Reason,
@@ -111,9 +111,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,

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

@@ -68,9 +68,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                         .Select(p => new
                         {
                             p.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             // salary = p.Profile.Salaries.Count() == 0 ? null : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
                             p.CreatedAt,
                             p.Organization,
@@ -109,9 +109,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             // salary = p.Profile.Salaries.Count() == 0 ? null : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
                             p.CreatedAt,
                             p.Organization,
@@ -155,9 +155,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,
@@ -237,9 +237,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,

BMA.EHR.Placement.Service/Requests/PlacementFileRequest.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Placement.Service.Requests
+{
+    public class PlacementFileRequest
+    {
+        public List<FormFile>? File { get; set; }
+    }
+}

BMA.EHR.Retirement.Service/Controllers/RetirementController.cs

@@ -286,9 +286,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         positionType = x.Profile.PositionType == null ? null : x.Profile.PositionType.Name,
                                         positionExecutive = x.Profile.PositionExecutive,
                                         posNo = x.Profile.PosNo == null ? null : x.Profile.PosNo.Name,
-                                        positionEmployeePosition = x.Profile.PositionEmployeePosition,
+                                        positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
-                                        positionEmployeeLevel = x.Profile.PositionEmployeeLevel,
+                                        positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,
-                                        positionEmployeeGroup = x.Profile.PositionEmployeeGroup,
+                                        positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name,
                                         posNoEmployee = x.Profile.PosNoEmployee,
                                     })
                                     .ToListAsync();
@@ -415,9 +415,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     positionType = x.Profile.PositionType == null ? null : x.Profile.PositionType.Name,
                                     positionExecutive = x.Profile.PositionExecutive,
                                     posNo = x.Profile.PosNo == null ? null : x.Profile.PosNo.Name,
-                                    positionEmployeePosition = x.Profile.PositionEmployeePosition,
+                                    positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
-                                    positionEmployeeLevel = x.Profile.PositionEmployeeLevel,
+                                    positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,
-                                    positionEmployeeGroup = x.Profile.PositionEmployeeGroup,
+                                    positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name,
                                     posNoEmployee = x.Profile.PosNoEmployee,
                                 })
                                 .ToListAsync();
@@ -475,9 +475,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     positionType = x.Profile.PositionType == null ? null : x.Profile.PositionType.Name,
                                     positionExecutive = x.Profile.PositionExecutive,
                                     posNo = x.Profile.PosNo == null ? null : x.Profile.PosNo.Name,
-                                    positionEmployeePosition = x.Profile.PositionEmployeePosition,
+                                    positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
-                                    positionEmployeeLevel = x.Profile.PositionEmployeeLevel,
+                                    positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,
-                                    positionEmployeeGroup = x.Profile.PositionEmployeeGroup,
+                                    positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name,
                                     posNoEmployee = x.Profile.PosNoEmployee,
                                 })
                                 .ToListAsync();

BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs

@@ -66,9 +66,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             p.CreatedAt,
                             p.Organization,
                             p.Reason,
@@ -111,9 +111,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,

BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs

@@ -66,9 +66,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             p.CreatedAt,
                             p.Organization,
                             p.Reason,
@@ -111,9 +111,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,

BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs

@@ -66,9 +66,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             p.CreatedAt,
                             p.Organization,
                             p.Reason,
@@ -111,9 +111,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             p.Profile.FirstName,
                             p.Profile.LastName,
                             ProfileId = p.Profile.Id,
-                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
+                            position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : (p.Profile.PositionEmployeePosition == null ? null : p.Profile.PositionEmployeePosition.Name),
                             posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
-                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
+                            positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : (p.Profile.PositionEmployeeLevel == null ? null : p.Profile.PositionEmployeeLevel.Name),
                             organizationOrganization = p.Profile.OrganizationOrganization,
                             p.Reason,
                             p.Status,

BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs

@@ -514,7 +514,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             .FirstOrDefaultAsync(x => x.Id == id);
             if (updated == null)
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
-
+            if ((DateTime.Now - updated.CreatedAt).TotalDays > 90)
+                return Error("สามารถยับยั้งได้ไม่เกิน 90 วัน");
             // updated.Status = "REJECT";
             updated.CommanderReject = true;
             updated.CommanderRejectReason = req.Reason;
@@ -570,7 +571,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             .FirstOrDefaultAsync(x => x.Id == id);
             if (updated == null)
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
-
+            if ((DateTime.Now - updated.CreatedAt).TotalDays > 90)
+                return Error("สามารถยับยั้งได้ไม่เกิน 90 วัน");
             updated.Status = "REJECT";
             updated.OligarchReject = true;
             updated.OligarchRejectReason = req.Reason;