hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

update placement and retire

Browse source
This commit is contained in:
AdisakKanthawilang 2025-06-16 12:10:50 +07:00
parent b528f0a81d
commit 706edbd0f0
32 changed files with 282 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BMA.EHR.Domain/Models/Placement/PlacementAppointment.cs
View file

@ -179,6 +179,16 @@ namespace BMA.EHR.Domain.Models.Placement
[Comment("ประเภทคำสั่ง")]
public string? typeCommand { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
// public OrgEmployee? OrgEmployee { get; set; }
// public PositionEmployeeStatus? PositionEmployeeStatus { get; set; }
// public PositionEmployeeLine? PositionEmployeeLine { get; set; }

9
BMA.EHR.Domain/Models/Placement/PlacementOfficer.cs
View file

@ -109,5 +109,14 @@ namespace BMA.EHR.Domain.Models.Placement
[Comment("เลขที่คำสั่ง")]
public string? commandNo { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
}
}

9
BMA.EHR.Domain/Models/Placement/PlacementProfile.cs
View file

@ -411,6 +411,15 @@ namespace BMA.EHR.Domain.Models.Placement
[Comment("Id รูปโปรไฟล์")]
public virtual Document? ProfileImg { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public virtual List<PlacementProfileDoc> PlacementProfileDocs { get; set; } = new List<PlacementProfileDoc>();
public virtual List<PlacementCertificate> PlacementCertificates { get; set; } = new List<PlacementCertificate>();
public virtual List<PlacementEducation> PlacementEducations { get; set; } = new List<PlacementEducation>();

8
BMA.EHR.Domain/Models/Placement/PlacementReceive.cs
View file

@ -184,6 +184,14 @@ namespace BMA.EHR.Domain.Models.Placement
[Comment("สถานะการใช้งาน")]
public bool IsActive { get; set; } = true;
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public virtual List<PlacementReceiveDoc> PlacementReceiveDocs { get; set; } = new List<PlacementReceiveDoc>();
}
}

8
BMA.EHR.Domain/Models/Placement/PlacementRepatriation.cs
View file

@ -103,5 +103,13 @@ namespace BMA.EHR.Domain.Models.Placement
public string? posLevelNameOld { get; set; }
[Comment("Id อ้างอิงช่วยราช")]
public Guid? refId { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
}
}

8
BMA.EHR.Domain/Models/Placement/PlacementTransfer.cs
View file

@ -98,6 +98,14 @@ namespace BMA.EHR.Domain.Models.Placement
public string? posLevelOldId { get; set; }
[Comment("ชื่อระดับตำแหน่ง old")]
public string? posLevelNameOld { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public virtual List<PlacementTransferDoc> PlacementTransferDocs { get; set; } = new List<PlacementTransferDoc>();
}
}

10
BMA.EHR.Domain/Models/Retirement/RetirementDeceased.cs
View file

@ -97,6 +97,16 @@ namespace BMA.EHR.Domain.Models.Retirement
[Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")]
public string? profileType { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public virtual List<RetirementDeceasedNoti> RetirementDeceasedNotis { get; set; } = new List<RetirementDeceasedNoti>();
}
}

8
BMA.EHR.Domain/Models/Retirement/RetirementOther.cs
View file

@ -181,6 +181,14 @@ namespace BMA.EHR.Domain.Models.Retirement
public string? posLevelId { get; set; }
[Comment("ชื่อระดับตำแหน่ง")]
public string? posLevelName { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public virtual List<RetirementOtherDoc> RetirementOtherDocs { get; set; } = new List<RetirementOtherDoc>();
}
}

9
BMA.EHR.Domain/Models/Retirement/RetirementOut.cs
View file

@ -103,5 +103,14 @@ namespace BMA.EHR.Domain.Models.Retirement
[Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")]
public string? profileType { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
}
}

9
BMA.EHR.Domain/Models/Retirement/RetirementProfile.cs
View file

@ -87,5 +87,14 @@ namespace BMA.EHR.Domain.Models.Retirement
public string? posExecutiveName { get; set; }
[Comment("เลขที่ตำแหน่ง ")]
public string? posNo { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
}
}

10
BMA.EHR.Domain/Models/Retirement/RetirementRawProfile.cs
View file

@ -76,5 +76,15 @@ namespace BMA.EHR.Domain.Models.Retirement
public string? posExecutiveName { get; set; }
[Comment("เลขที่ตำแหน่ง ")]
public string? posNo { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
}
}

8
BMA.EHR.Domain/Models/Retirement/RetirementResign.cs
View file

@ -156,6 +156,14 @@ namespace BMA.EHR.Domain.Models.Retirement
[Comment("คนยื่นมาอยู่ในกลุ่ม")]
public string? Group { get; set; } = string.Empty;
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public List<RetirementResignApprover> Approvers { get; set; } = new();

9
BMA.EHR.Domain/Models/Retirement/RetirementResignCancel.cs
View file

@ -137,6 +137,15 @@ namespace BMA.EHR.Domain.Models.Retirement
public string? Group { get; set; } = string.Empty;
[Required, Comment("อ้างอิงรับย้าย")]
public virtual RetirementResign RetirementResign { get; set; }
[Comment("ด้านทางการบริหาร")]
public string? positionExecutiveField { get; set; }
[Comment("ด้าน/สาขา")]
public string? positionArea { get; set; }
[Comment("ด้านทางการบริหาร (เก่า)")]
public string? positionExecutiveFieldOld { get; set; }
[Comment("ด้าน/สาขา (เก่า)")]
public string? positionAreaOld { get; set; }
public List<RetirementResignCancelApprover> Approvers { get; set; } = new();
}
}

32
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -118,6 +118,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posMasterNo,
p.position,
p.PositionExecutive,
p.positionExecutiveField,
p.positionArea,
p.positionField,
p.posTypeId,
p.posTypeName,
@ -167,6 +169,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posmasterId,
p.positionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.CreatedAt,
p.typeCommand,
})
@ -229,6 +233,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posMasterNo,
p.position,
p.PositionExecutive,
p.positionExecutiveField,
p.positionArea,
p.positionField,
p.posTypeId,
p.posTypeName,
@ -273,6 +279,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationOld,
p.positionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.typeCommand,
p.posmasterId,
})
@ -311,6 +319,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.posMasterNo,
data.position,
data.PositionExecutive,
data.positionExecutiveField,
data.positionArea,
data.positionField,
data.posTypeId,
data.posTypeName,
@ -359,6 +369,8 @@ namespace BMA.EHR.Placement.Service.Controllers
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
data.positionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
// Docs = placementAppointmentDocs,
data.typeCommand,
data.posmasterId,
@ -455,6 +467,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.positionOld = org.result.position;
placementAppointment.PositionExecutiveOld = org.result.posExecutiveName;
placementAppointment.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementAppointment.positionAreaOld = org.result.positionArea;
placementAppointment.PositionLevelOld = org.result.posLevelName;
placementAppointment.PositionTypeOld = org.result.posTypeName;
placementAppointment.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -577,6 +591,8 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName;
uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
@ -822,7 +838,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-",
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -907,6 +923,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
@ -1032,7 +1050,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-",
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1117,6 +1135,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
@ -1242,7 +1262,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1446,7 +1466,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.rootOld != null ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1660,7 +1680,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1744,6 +1764,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,

38
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -969,6 +969,8 @@ namespace BMA.EHR.Placement.Service.Controllers
person.posMasterNo = req.posMasterNo;
person.positionName = req.positionName;
person.PositionExecutive = req.posExecutiveName;
person.positionExecutiveField = req.positionExecutiveField;
person.positionArea = req.positionArea;
person.positionField = req.positionField;
person.posTypeId = req.posTypeId;
person.posTypeName = req.posTypeName;
@ -1630,7 +1632,7 @@ namespace BMA.EHR.Placement.Service.Controllers
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(),
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
Oc = (p.positionName == null ? "" : $"{p.positionName}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1806,7 +1808,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
commandId = r.commandId,
@ -1986,7 +1990,7 @@ namespace BMA.EHR.Placement.Service.Controllers
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(),
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
Oc = (p.positionName == null ? "" : $"{p.positionName}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -2154,7 +2158,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
commandId = r.commandId,
@ -2335,7 +2341,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree,
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -2352,7 +2358,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld,
NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -2438,7 +2444,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
@ -2567,7 +2575,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree,
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -2584,7 +2592,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -2670,7 +2678,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
@ -2788,7 +2798,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree,
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -2805,7 +2815,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-",
NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -2887,7 +2897,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,

14
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -113,6 +113,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -185,6 +187,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -243,6 +247,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -323,6 +329,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.OrganizationOld,
p.IsActive,
})
@ -403,6 +411,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementOfficer.PositionOld = org.result.position;
placementOfficer.PositionExecutiveOld = org.result.posExecutiveName;
placementOfficer.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementOfficer.positionAreaOld = org.result.positionArea;
placementOfficer.PositionLevelOld = org.result.posLevelName;
placementOfficer.PositionTypeOld = org.result.posTypeName;
placementOfficer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -678,7 +688,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
commandId = r.commandId,

18
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -157,6 +157,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posMasterNoOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
@ -244,6 +246,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.AmountOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.OrganizationOld,
p.PositionTypeOld,
p.PositionLevelOld,
@ -343,6 +347,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.AmountOld,
data.PositionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
data.PositionTypeOld,
data.PositionLevelOld,
@ -498,6 +504,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.PositionOld = org.result.position;
placementReceive.PositionExecutiveOld = org.result.posExecutiveName;
placementReceive.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementReceive.positionAreaOld = org.result.positionArea;
placementReceive.PositionLevelOld = org.result.posLevelName;
placementReceive.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -674,6 +682,8 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName;
uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
@ -941,7 +951,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOrg = p.OrganizationPositionOld ?? "-",
OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -951,7 +961,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldPositionLevel = p.PositionLevelOld ?? "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1078,7 +1088,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
commandId = r.commandId,

10
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -114,6 +114,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -201,6 +203,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.DateRepatriation,
})
.FirstOrDefaultAsync();
@ -289,6 +293,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementRepatriation.PositionOld = org.result.position;
placementRepatriation.PositionExecutiveOld = org.result.posExecutiveName;
placementRepatriation.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementRepatriation.positionAreaOld = org.result.positionArea;
placementRepatriation.PositionLevelOld = org.result.posLevelName;
placementRepatriation.PositionTypeOld = org.result.posTypeName;
placementRepatriation.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -550,7 +556,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
commandId = r.commandId,

16
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -207,6 +207,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -283,6 +285,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
.FirstOrDefaultAsync();
@ -338,6 +342,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.OrganizationPositionOld,
data.PositionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
Docs = placementTransferDocs,
};
@ -407,6 +413,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
.FirstOrDefaultAsync();
@ -462,6 +470,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.OrganizationPositionOld,
data.PositionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
Docs = placementTransferDocs,
};
@ -538,6 +548,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementTransfer.AmountOld = org.result.salary;
placementTransfer.PositionOld = org.result.position;
placementTransfer.PositionExecutiveOld = org.result.posExecutiveName;
placementTransfer.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementTransfer.positionAreaOld = org.result.positionArea;
placementTransfer.PositionLevelOld = org.result.posLevelName;
placementTransfer.PositionTypeOld = org.result.posTypeName;
placementTransfer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -877,7 +889,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
commandId = r.commandId,

2
BMA.EHR.Placement.Service/Requests/OrgRequest.cs
View file

@ -42,6 +42,8 @@ namespace BMA.EHR.Placement.Service.Requests
public int? posMasterNo { get; set; }
public string? position { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }
public string? posLevelId { get; set; }

2
BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs
View file

@ -30,5 +30,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; }
public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
}
}

2
BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs
View file

@ -30,5 +30,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; }
public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
}
}

3
BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs
View file

@ -39,5 +39,8 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; }
public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
}
}

18
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -376,6 +376,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
posLevelRank = profile.posLevelRank,
posExecutiveId = profile.posExecutiveId,
posExecutiveName = profile.posExecutiveName,
positionExecutiveField = profile.positionExecutiveField,
positionArea = profile.positionArea,
posNo = profile.posNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -419,6 +421,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
posLevelRank = profile.posLevelRank,
posExecutiveId = profile.posExecutiveId,
posExecutiveName = profile.posExecutiveName,
positionExecutiveField = profile.positionExecutiveField,
positionArea = profile.positionArea,
posNo = profile.posNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -479,6 +483,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
posLevelRank = x.posLevelRank,
posExecutiveId = x.posExecutiveId,
posExecutiveName = x.posExecutiveName,
positionExecutiveField = x.positionExecutiveField,
positionArea = x.positionArea,
posNo = x.posNo,
})
.ToListAsync();
@ -574,6 +580,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
posLevelRank = profileOld.posLevelRank,
posExecutiveId = profileOld.posExecutiveId,
posExecutiveName = profileOld.posExecutiveName,
positionExecutiveField = profileOld.positionExecutiveField,
positionArea = profileOld.positionArea,
posNo = profileOld.posNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -636,6 +644,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
posLevelRank = profileOld.posLevelRank,
posExecutiveId = profileOld.posExecutiveId,
posExecutiveName = profileOld.posExecutiveName,
positionExecutiveField = profileOld.positionExecutiveField,
positionArea = profileOld.positionArea,
posNo = profileOld.posNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -681,6 +691,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionType = x.posTypeName,
positionLevel = x.posLevelName,
positionExecutive = x.posExecutiveName,
positionExecutiveField = x.positionExecutiveField,
positionArea = x.positionArea,
posNo = x.posNo,
})
.ToListAsync();
@ -791,6 +803,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
posTypeName = x.posTypeName,
posLevelName = x.posLevelName,
posExecutiveName = x.posExecutiveName,
positionExecutiveField = x.positionExecutiveField,
positionArea = x.positionArea,
posNo = x.posNo,
// positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
// positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,
@ -976,6 +990,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.posLevelRank = org.result.posLevelRank;
data.posExecutiveId = org.result.posExecutiveId;
data.posExecutiveName = org.result.posExecutiveName;
data.positionExecutiveField = org.result.positionExecutiveField;
data.positionArea = org.result.positionArea;
data.posNo = org.result.posNo;
dataRaw.profileId = org.result.profileId;
@ -1008,6 +1024,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
dataRaw.posLevelRank = org.result.posLevelRank;
dataRaw.posExecutiveId = org.result.posExecutiveId;
dataRaw.posExecutiveName = org.result.posExecutiveName;
dataRaw.positionExecutiveField = org.result.positionExecutiveField;
dataRaw.positionArea = org.result.positionArea;
dataRaw.posNo = org.result.posNo;
_context.RetirementProfiles.Add(data);

2
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -290,6 +290,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceased.posMasterNo = org.result.posMasterNo;
retirementDeceased.position = org.result.position;
retirementDeceased.PositionExecutiveOld = org.result.posExecutiveName;
retirementDeceased.positionExecutiveFieldOld = org.result.positionExecutiveField;
retirementDeceased.positionAreaOld = org.result.positionArea;
retirementDeceased.posTypeId = org.result.posTypeId;
retirementDeceased.posTypeName = $"{org.result.posTypeShortName} {org.result.posTypeName}";
retirementDeceased.posLevelId = org.result.posLevelId;

16
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -406,6 +406,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.LeaveDate = org.result.leaveDate;
retirementOther.PositionOld = org.result.position;
retirementOther.PositionExecutiveOld = org.result.posExecutiveName;
retirementOther.positionExecutiveFieldOld = org.result.positionExecutiveField;
retirementOther.positionAreaOld = org.result.positionArea;
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -528,6 +530,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName;
uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
@ -731,7 +735,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionArea == null ? $"{p.positionExecutiveField}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -812,7 +816,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = false,
@ -973,7 +979,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -1054,7 +1060,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = false,

6
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -300,6 +300,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.PositionOld = org.result.position;
retirementOut.PositionExecutiveOld = org.result.posExecutiveName;
retirementOut.positionExecutiveFieldOld = org.result.positionExecutiveField;
retirementOut.positionAreaOld = org.result.positionArea;
retirementOut.PositionLevelOld = org.result.posLevelName;
retirementOut.PositionTypeOld = org.result.posTypeName;
retirementOut.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -562,7 +564,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = true,

12
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -1301,6 +1301,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.AmountOld = org.result.salary;
retirementResign.PositionOld = org.result.position;
retirementResign.PositionExecutiveOld = org.result.posExecutiveName;
retirementResign.positionExecutiveFieldOld = org.result.positionExecutiveField;
retirementResign.positionAreaOld = org.result.positionArea;
retirementResign.PositionLevelOld = org.result.posLevelName;
retirementResign.PositionTypeOld = org.result.posTypeName;
retirementResign.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -2626,7 +2628,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = p.IsCancel == true ? false : true,
@ -2748,7 +2752,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
PositionName = p.PositionOld ?? "-",
Organization = p.OrganizationPositionOld ?? "-",
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -2824,7 +2828,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = false,

2
BMA.EHR.Retirement.Service/Requests/OrgRequest.cs
View file

@ -48,6 +48,8 @@ namespace BMA.EHR.Retirement.Service.Requests
public int? posLevelRank { get; set; }
public string? posExecutiveId { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
public string? posNo { get; set; }
public DateTime? leaveDate { get; set; }
public string? education { get; set; }

2
BMA.EHR.Retirement.Service/Requests/OrgRequestArray.cs
View file

@ -42,6 +42,8 @@ namespace BMA.EHR.Retirement.Service.Requests
public int? posLevelRank { get; set; }
public string? posExecutiveId { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
public string? posNo { get; set; }
}
}

2
BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs
View file

@ -30,5 +30,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? posLevelName { get; set; }
public string? typeCommand { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
}
}

2
BMA.EHR.Retirement.Service/Requests/ProfileJsonRequest.cs
View file

@ -58,6 +58,8 @@ namespace BMA.EHR.Retirement.Service.Requests
public int? posLevelRank { get; set; }
public string? posExecutiveId { get; set; }
public string? posExecutiveName { get; set; }
public string? positionExecutiveField { get; set; }
public string? positionArea { get; set; }
public string? posNo { get; set; }
}
}