From 68e6e3a63fbf0f2ac86f15d533f7224c57b1bbdf Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Thu, 28 Sep 2023 10:11:24 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=84=E0=B8=B3=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B8=20=E0=B8=A5=E0=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Commands/CommandReportRepository.cs       |  30 +++++++++++++-----
 .../Reports/CommandType16Response.cs          |   2 ++
 .../Reports/CommandType21Response.cs          |   2 ++
 ...0-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp | Bin 29641 -> 29668 bytes
 .../30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp  | Bin 28757 -> 28761 bytes
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index aa6f5fbd..309e14a0 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -763,6 +763,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                                 .ThenInclude(p => p.Position)
                                                 .Include(p => p.Profile)
                                                 .ThenInclude(p => p.Salaries)
+                                                .Include(p => p.Profile)
+                                                .ThenInclude(p => p.Prefix)
                                    on r.RefPlacementProfileId equals p.Id
                                    orderby r.Sequence
                                    select new CommandType16Response
@@ -777,7 +779,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        GovAidCommandDate = r.Command.GovAidCommandDate == null ? "" :
                                                            r.Command.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
                                        StartDate = "", // TODO: Frontend ไม่มีการเก็บค่าไว้ หรือไม่มีเก็บไว้จากระบบบรรจุ ทำให้ดึงมาแสดงไม่ได้
-                                       ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber()
+                                       ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber(),
+                                       FullName = $"{p.Profile.Prefix!.Name}{p.Profile.FirstName!} {p.Profile.LastName!}"
                                    })
                                    .ToList();
 
@@ -1019,20 +1022,31 @@ namespace BMA.EHR.Application.Repositories.Commands
                                         .ThenInclude(x => x.PositionType)
                                         .Include(x => x.Profile)
                                         .ThenInclude(x => x.PosNo)
+                                        .Include(x => x.OrgEmployee)
+                                        .ThenInclude(x => x.OrganizationAgency)
+                                        .ThenInclude(x => x.OrganizationOrganization)
+                                        //.Include(x => x.OrgEmployee)
+                                        //.ThenInclude(x => x.PosNo)
+                                        .Include(x => x.OrgEmployee)
+                                        .ThenInclude(x => x.PositionEmployeePosition)
+                                        .Include(x => x.OrgEmployee)
+                                        .ThenInclude(x => x.OrganizationPositionEmployeeLevels)
+                                        .ThenInclude(x => x.PositionEmployeeLevel)
                                    on r.RefPlacementProfileId equals p.Id
                                    orderby r.Sequence
                                    select new CommandType21Response
                                    {
                                        Seq = r.Sequence.ToString().ToThaiNumber(),
-                                       CitizenId = r.CitizenId,
+                                       CitizenId = r.CitizenId.ToThaiNumber(),
                                        FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
-                                       Organization = p.Profile!.EmployeeOc,
-                                       PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name,
-                                       PositionLevel = p.Profile.PositionLevel == null ? "" : p.Profile.PositionLevel.Name,
-                                       PositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name,
-                                       PositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name.ToThaiNumber(),
+                                       Organization = p.OrgEmployee!.OrganizationAgency!.OrganizationOrganization!.Name,
+                                       PositionName = p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name.ToThaiNumber(),
+                                       PositionLevel = p.OrgEmployee.OrganizationPositionEmployeeLevels == null ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.First().PositionEmployeeLevel.Name.ToThaiNumber(),
+                                       PositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name.ToThaiNumber(),
+                                       PositionNumber = p.OrgEmployee.PosNo == null ? "" : p.OrgEmployee.PosNo.ToThaiNumber(),
                                        Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       RetireDate = p.Profile.BirthDate.CalculateRetireDate().ToThaiFullDate3().ToThaiNumber()
+                                       RetireDate = p.Profile.BirthDate.CalculateRetireDate().ToThaiFullDate3().ToThaiNumber(),
+                                       CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber()
                                    })
                                   .ToList();
 
diff --git a/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs
index 22a10cef..8208cab2 100644
--- a/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs
+++ b/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs
@@ -27,5 +27,7 @@ namespace BMA.EHR.Application.Responses.Reports
         public string StartDate { get; set; } = string.Empty;
 
         public string ActiveDate { get; set; } = string.Empty;
+
+        public string FullName { get; set;} = string.Empty;
     }
 }
diff --git a/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs
index 7823d041..51fcfc7e 100644
--- a/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs
+++ b/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs
@@ -21,5 +21,7 @@
         public string Salary { get; set; } = string.Empty;
 
         public string RetireDate { get; set;} = string.Empty;
+
+        public string CommandYear { get; set; } = string.Empty; 
     }
 }
diff --git a/BMA.EHR.Report.Service/Reports/20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp b/BMA.EHR.Report.Service/Reports/20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp
index 7e411d614f29816181378128ebb3eaaf3a2ca8e1..311a2f238bc25575bf40a28eb379144466f201f9 100644
GIT binary patch
delta 2488
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
Cw8Q=Y

delta 2461
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
bb1nl^a66Nna~lHvag(`oB?jzr00000fvL1$

diff --git a/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp b/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp
index a3d26f887fd5aa151c10112e7fd1860247931ca3..c8ec03414b12b492e4bf4021b52a911f2f8fbfa4 100644
GIT binary patch
delta 1573
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
X`Aa;L4R9L)jgu*GCI)<O00000s7?AA

delta 1569
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
T5pWv;iIXjGCI)zK00000;HK#n