From 2bfa6ae500d2317e3468d7c48c8303b4ad5932fc Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Tue, 10 Oct 2023 16:14:25 +0700
Subject: [PATCH 1/2] =?UTF-8?q?Command=20C-PM-22,=20C-PM-23=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B0=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B9=81=E0=B8=99=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=97=E0=B9=89=E0=B8=B2=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Commands/CommandRepository.cs             | 130 +++++++++++++
 .../Controllers/OrderController.cs            | 184 ++++++++++++++++++
 BMA.EHR.Command.Service/SeedCommand.xlsx      | Bin 11811 -> 11947 bytes
 3 files changed, 314 insertions(+)

diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index 4135b44d..a3a8278d 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -146,6 +146,12 @@ namespace BMA.EHR.Application.Repositories.Commands
                 case "C-PM-21":
                     result = await GetReceiver21Async(command);
                     break;
+                case "C-PM-22":
+                    result = await GetReceiver22Async(command);
+                    break;
+                case "C-PM-23":
+                    result = await GetReceiver23Async(command);
+                    break;
                 default: throw new Exception(GlobalMessages.MethodForCommandTypeNotImplement);
             }
 
@@ -1202,6 +1208,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                             .ThenInclude(x => x.Prefix)
                                             //.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
                                             .Where(x => !otherCommandReceivers.Contains(x.Profile!.CitizenId!))
+                                            .Where(x => x.Profile.ProfileType == "officer")
                                             .Where(x => x.Status.Trim().ToUpper() == "REPORT")
                                             .OrderBy(x => x.Profile!.CitizenId)
                                             .ToListAsync();
@@ -1464,6 +1471,129 @@ namespace BMA.EHR.Application.Repositories.Commands
             }
         }
 
+
+        /// <summary>
+        /// C-PM-22 - คำสั่งจ้างและแต่งตั้งลูกจ้างประจำ
+        /// </summary>
+        /// <param name="command">object ของรายการคำสั่ง</param>
+        /// <returns></returns>
+        private async Task<List<CommandReceiver>> GetReceiver22Async(Command command)
+        {
+            try
+            {
+                var result = new List<CommandReceiver>();
+                // TODO : ต้องมา list คนตามประเภทอีกครั้งนึง
+
+                // 1. หารายชื่อที่ถูกเลือกไปแล้ว ในประเภทเดียวกัน
+                var otherCommandReceivers = await _dbContext.Set<CommandReceiver>()
+                                                    .Include(x => x.Command)
+                                                    .ThenInclude(x => x.CommandType)
+                                                    .Where(x => x.Command.CommandType.CommandCode.Trim().ToUpper() == "C-PM-22")
+                                                    .Where(x => x.Command.Id != command.Id)
+                                                    .Select(x => x.CitizenId)
+                                                    .ToListAsync();
+
+                // 2. Query
+                var appointPeople = await _dbContext.Set<PlacementAppointment>()
+                                            .Include(x => x.CommandType)
+                                            .Include(x => x.Prefix)
+                                            .Include(x => x.OrganizationPosition)
+                                            .ThenInclude(x => x!.Organization)
+                                            .Include(x => x.Profile)
+                                            //.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
+                                            .Where(x => !otherCommandReceivers.Contains(x.CitizenId!))
+                                            .Where(x => x.Status.Trim().ToUpper() == "REPORT")
+                                            .Where(x => x.CommandType!.Id == command.CommandType!.Id)
+                                            .Where(x => x.Profile.ProfileType == "employee")
+                                            .OrderBy(x => x.CitizenId)
+                                            .ToListAsync();
+
+                // 3. Create new Record
+                var seq = 1;
+                foreach (var item in appointPeople)
+                {
+                    var receiver = new CommandReceiver
+                    {
+                        Sequence = seq,
+                        CitizenId = item.CitizenId!,
+                        Prefix = item.Prefix!.Name,
+                        FirstName = item.Firstname!,
+                        LastName = item.Lastname!,
+                        RefPlacementProfileId = item.Id,
+                        Amount = item.AmountOld,
+                    };
+                    seq++;
+
+                    result.Add(receiver);
+                }
+
+                return result;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// C-PM-23 - คำสั่งให้ลูกจ้างออกจากราชการ
+        /// </summary>
+        /// <param name="command">object ของรายการคำสั่ง</param>
+        /// <returns></returns>
+        private async Task<List<CommandReceiver>> GetReceiver23Async(Command command)
+        {
+            try
+            {
+                var result = new List<CommandReceiver>();
+                // TODO : ต้องมา list คนตามประเภทอีกครั้งนึง
+
+                // 1. หารายชื่อที่ถูกเลือกไปแล้ว ในประเภทเดียวกัน
+                var otherCommandReceivers = await _dbContext.Set<CommandReceiver>()
+                                                    .Include(x => x.Command)
+                                                    .ThenInclude(x => x.CommandType)
+                                                    .Where(x => x.Command.CommandType.CommandCode.Trim().ToUpper() == "C-PM-23")
+                                                    .Where(x => x.Command.Id != command.Id)
+                                                    .Select(x => x.CitizenId)
+                                                    .ToListAsync();
+
+                // 2. Query
+                var appointPeople = await _dbContext.Set<RetirementResign>()
+                                            .Include(x => x.Profile)
+                                            .ThenInclude(x => x.Prefix)
+                                            //.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
+                                            .Where(x => !otherCommandReceivers.Contains(x.Profile!.CitizenId!))
+                                            .Where(x => x.Profile.ProfileType == "employee")
+                                            .Where(x => x.Status.Trim().ToUpper() == "REPORT")
+                                            .OrderBy(x => x.Profile!.CitizenId)
+                                            .ToListAsync();
+
+                // 3. Create new Record
+                var seq = 1;
+                foreach (var item in appointPeople)
+                {
+                    var receiver = new CommandReceiver
+                    {
+                        Sequence = seq,
+                        CitizenId = item.Profile!.CitizenId!,
+                        Prefix = item.Profile!.Prefix!.Name,
+                        FirstName = item.Profile!.FirstName!,
+                        LastName = item.Profile!.LastName!,
+                        RefPlacementProfileId = item.Id,
+                        Amount = item.AmountOld,
+                    };
+                    seq++;
+
+                    result.Add(receiver);
+                }
+
+                return result;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         #endregion
 
         #region " Execute and Deploy "
diff --git a/BMA.EHR.Command.Service/Controllers/OrderController.cs b/BMA.EHR.Command.Service/Controllers/OrderController.cs
index cc144a26..127c81c2 100644
--- a/BMA.EHR.Command.Service/Controllers/OrderController.cs
+++ b/BMA.EHR.Command.Service/Controllers/OrderController.cs
@@ -260,6 +260,8 @@ namespace BMA.EHR.Command.Service.Controllers
                     case "C-PM-19":
                     case "C-PM-20":
                     case "C-PM-21":
+                    case "C-PM-22":
+                    case "C-PM-23":
                         {
                             if (command.CommandNo != "" &&
                                 command.CommandYear != null &&
@@ -2636,6 +2638,188 @@ namespace BMA.EHR.Command.Service.Controllers
 
         #endregion
 
+        #region " C-PM-22 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-22
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-22/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType22Async([FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-22
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-22/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType22Async(Guid orderId, [FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-23 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-23
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-23/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType23Async([FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-23
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-23/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType23Async(Guid orderId, [FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
         #endregion
 
         /// <summary>
diff --git a/BMA.EHR.Command.Service/SeedCommand.xlsx b/BMA.EHR.Command.Service/SeedCommand.xlsx
index 2a46382153000b8ca1026709fb342f0f99741057..0a3032ad4e2d019a77ebaaf1d0f7c4bb46050980 100644
GIT binary patch
delta 5139
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
U`z<9xun6+}79Yu|*x%y+0mjYAM*si-

delta 5041
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
I-~ZeAe`=3unE(I)


From 064fe27f8976acda110fb734b5fff3fad404b23f Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Wed, 11 Oct 2023 10:09:26 +0700
Subject: [PATCH 2/2] Change

---
 .../Repositories/Commands/CommandRepository.cs             | 7 +++++--
 BMA.EHR.Domain/Models/Commands/Core/CommandReceiver.cs     | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index a3a8278d..ef3c4184 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -16,9 +16,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
-using System.Linq;
 using System.Net.Http.Headers;
-using System.Text;
 using Command = BMA.EHR.Domain.Models.Commands.Core.Command;
 using Profile = BMA.EHR.Domain.Models.HR.Profile;
 
@@ -6035,6 +6033,11 @@ namespace BMA.EHR.Application.Repositories.Commands
             }
         }
 
+        #endregion
+
+        #region " Regenerate Json File "
+
+
         #endregion
 
         #endregion
diff --git a/BMA.EHR.Domain/Models/Commands/Core/CommandReceiver.cs b/BMA.EHR.Domain/Models/Commands/Core/CommandReceiver.cs
index 40b5e52d..75ff4f1c 100644
--- a/BMA.EHR.Domain/Models/Commands/Core/CommandReceiver.cs
+++ b/BMA.EHR.Domain/Models/Commands/Core/CommandReceiver.cs
@@ -30,6 +30,9 @@ namespace BMA.EHR.Domain.Models.Commands.Core
         [Column(TypeName = "text"), Comment("หมายเหตุ")]
         public string Comment { get; set; } = string.Empty;
 
+        [Column(TypeName = "text"), Comment("หมายเหตุแนวนอน")]
+        public string Comment2 { get; set; } = string.Empty;
+
         [Comment("รหัสอ้างอิงไปยังข้อมูลผู้บรรจุ")]
         public Guid? RefPlacementProfileId { get; set; }