diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 0ba50098..d4267a49 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -1598,12 +1598,12 @@ namespace BMA.EHR.Application.Repositories.Commands LastName = d.lastName, RefPlacementProfileId = d.id, RefDisciplineId = d.id, - Organization = d.Organization, - PositionName = d.PositionName, - PositionLevel = d.PositionLevel, - PositionType = d.PositionType, - PositionNumber = d.PositionNumber, - BirthDate = d.BirthDate, + Organization = d.organization, + PositionName = d.positionName, + PositionLevel = d.positionLevel, + PositionType = d.positionType, + PositionNumber = d.positionNumber, + BirthDate = d.birthDate, }; seq++; @@ -7526,15 +7526,14 @@ namespace BMA.EHR.Application.Repositories.Commands { var data = command.Receivers.Select(x => new { - PersonId = x.RefPlacementProfileId, - Id = x.RefDisciplineId, - TemplateDoc = "คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - Amount = x.Amount, - PositionSalaryAmount = x.PositionSalaryAmount, - MouthSalaryAmount = x.MouthSalaryAmount, - RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", + personId = x.RefPlacementProfileId.ToString(), + id = x.RefDisciplineId.ToString(), + templateDoc = "คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", + amount = x.Amount, + positionSalaryAmount = x.PositionSalaryAmount, + mouthSalaryAmount = x.MouthSalaryAmount, + refCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", }); - var baseAPI = _configuration["API"]; var apiUrl = $"{baseAPI}/org/profile-employee/report/resume"; using (var client = new HttpClient()) @@ -11135,7 +11134,13 @@ namespace BMA.EHR.Application.Repositories.Commands RefDisciplineId = item.RefDisciplineId, Amount = salary == null ? 0 : salary.SalaryAmount, MouthSalaryAmount = salary == null ? 0 : salary.MonthSalaryAmount, - PositionSalaryAmount = salary == null ? 0 : salary.PositionSalaryAmount + PositionSalaryAmount = salary == null ? 0 : salary.PositionSalaryAmount, + Organization = item.Organization, + PositionName = item.PositionName, + PositionLevel = item.PositionLevel, + PositionType = item.PositionType, + PositionNumber = item.PositionNumber, + BirthDate = item.BirthDate, }; seq++; diff --git a/BMA.EHR.Application/Responses/PassSalaryResponse.cs b/BMA.EHR.Application/Responses/PassSalaryResponse.cs index e0307cf3..6186a3d1 100644 --- a/BMA.EHR.Application/Responses/PassSalaryResponse.cs +++ b/BMA.EHR.Application/Responses/PassSalaryResponse.cs @@ -18,11 +18,11 @@ // public Guid? commandId { get; set; } = Guid.Empty; - public DateTime? BirthDate { get; set; } - public string? Organization { get; set; } - public string? PositionName { get; set; } - public string? PositionLevel { get; set; } - public string? PositionType { get; set; } - public string? PositionNumber { get; set; } + public DateTime? birthDate { get; set; } + public string? organization { get; set; } + public string? positionName { get; set; } + public string? positionLevel { get; set; } + public string? positionType { get; set; } + public string? positionNumber { get; set; } } } diff --git a/BMA.EHR.Command.Service/Controllers/OrderController.cs b/BMA.EHR.Command.Service/Controllers/OrderController.cs index c062ebcf..09656fed 100644 --- a/BMA.EHR.Command.Service/Controllers/OrderController.cs +++ b/BMA.EHR.Command.Service/Controllers/OrderController.cs @@ -4571,7 +4571,13 @@ namespace BMA.EHR.Command.Service.Controllers IdCard = r.CitizenId, Name = $"{r.Prefix}{r.FirstName} {r.LastName}", SelectStatus = r.RefPlacementProfileId == null ? false : (existed.FirstOrDefault(x => x.RefPlacementProfileId!.Value == r.RefPlacementProfileId!.Value) != null), - Education = "" // ยังหาไม่เจอว่าอยุ่ field ไหน + Education = "", // ยังหาไม่เจอว่าอยุ่ field ไหน + Organization = r.Organization == null ? null : r.Organization, + PositionName = r.PositionName == null ? null : r.PositionName, + PositionLevel = r.PositionLevel == null ? null : r.PositionLevel, + PositionType = r.PositionType == null ? null : r.PositionType, + PositionNumber = r.PositionNumber == null ? null : r.PositionNumber, + BirthDate = r.BirthDate == null ? null : r.BirthDate, }).ToList(); // ให้ Update Salary เฉพาะของ Command 01-04 diff --git a/BMA.EHR.Command.Service/Responses/CommandReceiverResponse.cs b/BMA.EHR.Command.Service/Responses/CommandReceiverResponse.cs index e6bd9a7f..62dab4ee 100644 --- a/BMA.EHR.Command.Service/Responses/CommandReceiverResponse.cs +++ b/BMA.EHR.Command.Service/Responses/CommandReceiverResponse.cs @@ -18,8 +18,16 @@ public double SalaryAmount { get; set; } = 0; - public double PositionSalaryAmount { get; set; } = 0; + public double PositionSalaryAmount { get; set; } = 0; public double MonthSalaryAmount { get; set; } = 0; + + + public string? Organization { get; set; } + public string? PositionName { get; set; } + public string? PositionLevel { get; set; } + public string? PositionType { get; set; } + public string? PositionNumber { get; set; } + public DateTime? BirthDate { get; set; } } }