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

add dna

Browse source
This commit is contained in:
kittapath 2025-02-05 17:48:58 +07:00
parent dbe6916782
commit 5ea175ca77
61 changed files with 66329 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1480,7 +1480,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
//เกษียณ
var retire = _context.RetirementPeriods
.Include(x => x.RetirementProfiles.Where(x => x.rootId == org.rootId))
.Include(x => x.RetirementProfiles.Where(x =>
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true)))
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
@ -1509,7 +1514,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(org.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(org.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -1519,7 +1528,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ให้ออก
@ -1529,7 +1542,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.rootOldId.Contains(org.rootId))
(node == 0 ? x.rootDnaOldId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(org.child4DnaId) : true))
.Count();
//ปลดออก
@ -1540,7 +1557,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.CommandTypeId == Guid.Parse("ef8db4d7-1472-4c1d-b73f-9114e618a96f") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ไล่ออก
@ -1551,7 +1572,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.CommandTypeId == Guid.Parse("d9dee5c3-b75a-4927-9ce2-51e2233cf20b") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
data1.Add(new
@ -1579,7 +1604,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
//เกษียณ
var retire = _context.RetirementPeriods
.Include(x => x.RetirementProfiles.Where(x => x.rootId == org.rootId))
.Include(x => x.RetirementProfiles.Where(x =>
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true)))
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
@ -1593,7 +1623,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId == org.rootId &&
(node == 0 ? x.rootDnaOldId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(org.child4DnaId) : true) &&
x.IsCancel == false && x.Status == "DONE")
.ToList();
@ -1608,7 +1642,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(org.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(org.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -1618,7 +1656,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ให้ออก
@ -1628,7 +1670,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.rootOldId.Contains(org.rootId))
(node == 0 ? x.rootDnaOldId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(org.child4DnaId) : true))
.Count();
//ปลดออก
@ -1639,7 +1685,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.CommandTypeId == Guid.Parse("ef8db4d7-1472-4c1d-b73f-9114e618a96f") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ไล่ออก
@ -1650,7 +1700,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.CommandTypeId == Guid.Parse("d9dee5c3-b75a-4927-9ce2-51e2233cf20b") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
data2.Add(new
@ -1772,17 +1826,22 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
//เกษียณ
var retire = _context.RetirementPeriods
.Include(x => x.RetirementProfiles.Where(x => x.rootId == org.rootId))
.Include(x => x.RetirementProfiles.Where(x =>
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true)))
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Type.Trim().ToUpper() == "OFFICER")
x.Type.Trim().ToUpper() == "EMPLOYEE")
.FirstOrDefault();
var rt_count = retire != null ? retire.RetirementProfiles.Count() : 0;
//ลาออก
var retirementResigns = _context.RetirementResigns
var retirementResigns = _context.RetirementResignEmployees
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
@ -1801,8 +1860,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.rootId.Contains(org.rootId))
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ให้ออก
@ -1811,7 +1874,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
x.rootOldId.Contains(org.rootId))
.Count();
@ -1821,9 +1884,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
x.CommandTypeId == Guid.Parse("ef8db4d7-1472-4c1d-b73f-9114e618a96f") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ไล่ออก
@ -1832,9 +1899,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
x.CommandTypeId == Guid.Parse("d9dee5c3-b75a-4927-9ce2-51e2233cf20b") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
data1.Add(new
@ -1861,17 +1932,22 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
//เกษียณ
var retire = _context.RetirementPeriods
.Include(x => x.RetirementProfiles.Where(x => x.rootId == org.rootId))
.Include(x => x.RetirementProfiles.Where(x =>
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true)))
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Type.Trim().ToUpper() == "OFFICER")
x.Type.Trim().ToUpper() == "EMPLOYEE")
.FirstOrDefault();
var rt_count = retire != null ? retire.RetirementProfiles.Count() : 0;
//ลาออก
var retirementResigns = _context.RetirementResigns
var retirementResigns = _context.RetirementResignEmployees
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
@ -1890,8 +1966,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.rootId.Contains(org.rootId))
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ให้ออก
@ -1900,7 +1980,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
x.rootOldId.Contains(org.rootId))
.Count();
@ -1910,9 +1990,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
x.CommandTypeId == Guid.Parse("ef8db4d7-1472-4c1d-b73f-9114e618a96f") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
//ไล่ออก
@ -1921,9 +2005,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.Status.Trim().ToUpper() == "DONE" &&
x.profileType.Trim().ToUpper() == "OFFICER" &&
x.profileType.Trim().ToUpper() == "EMPLOYEE" &&
x.CommandTypeId == Guid.Parse("d9dee5c3-b75a-4927-9ce2-51e2233cf20b") &&
x.rootId.Contains(org.rootId))
(node == 0 ? x.rootDnaId.Contains(org.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(org.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(org.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(org.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(org.child4DnaId) : true))
.Count();
data2.Add(new

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

@ -267,18 +267,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceased.citizenId = org.result.citizenId;
retirementDeceased.root = org.result.root;
retirementDeceased.rootId = org.result.rootId;
retirementDeceased.rootDnaId = org.result.rootDnaId;
retirementDeceased.rootShortName = org.result.rootShortName;
retirementDeceased.child1 = org.result.child1;
retirementDeceased.child1Id = org.result.child1Id;
retirementDeceased.child1DnaId = org.result.child1DnaId;
retirementDeceased.child1ShortName = org.result.child1ShortName;
retirementDeceased.child2 = org.result.child2;
retirementDeceased.child2Id = org.result.child2Id;
retirementDeceased.child2DnaId = org.result.child2DnaId;
retirementDeceased.child2ShortName = org.result.child2ShortName;
retirementDeceased.child3 = org.result.child3;
retirementDeceased.child3Id = org.result.child3Id;
retirementDeceased.child3DnaId = org.result.child3DnaId;
retirementDeceased.child3ShortName = org.result.child3ShortName;
retirementDeceased.child4 = org.result.child4;
retirementDeceased.child4Id = org.result.child4Id;
retirementDeceased.child4DnaId = org.result.child4DnaId;
retirementDeceased.child4ShortName = org.result.child4ShortName;
retirementDeceased.posMasterNo = org.result.posMasterNo;
retirementDeceased.position = org.result.position;
@ -329,18 +334,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceased.citizenId = org.result.citizenId;
retirementDeceased.root = org.result.root;
retirementDeceased.rootId = org.result.rootId;
retirementDeceased.rootDnaId = org.result.rootDnaId;
retirementDeceased.rootShortName = org.result.rootShortName;
retirementDeceased.child1 = org.result.child1;
retirementDeceased.child1Id = org.result.child1Id;
retirementDeceased.child1DnaId = org.result.child1DnaId;
retirementDeceased.child1ShortName = org.result.child1ShortName;
retirementDeceased.child2 = org.result.child2;
retirementDeceased.child2Id = org.result.child2Id;
retirementDeceased.child2DnaId = org.result.child2DnaId;
retirementDeceased.child2ShortName = org.result.child2ShortName;
retirementDeceased.child3 = org.result.child3;
retirementDeceased.child3Id = org.result.child3Id;
retirementDeceased.child3DnaId = org.result.child3DnaId;
retirementDeceased.child3ShortName = org.result.child3ShortName;
retirementDeceased.child4 = org.result.child4;
retirementDeceased.child4Id = org.result.child4Id;
retirementDeceased.child4DnaId = org.result.child4DnaId;
retirementDeceased.child4ShortName = org.result.child4ShortName;
retirementDeceased.posMasterNo = org.result.posMasterNo;
retirementDeceased.position = org.result.position;

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

@ -372,18 +372,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.citizenId = org.result.citizenId;
retirementOther.rootOld = org.result.root;
retirementOther.rootOldId = org.result.rootId;
retirementOther.rootDnaOldId = org.result.rootDnaId;
retirementOther.rootShortNameOld = org.result.rootShortName;
retirementOther.child1Old = org.result.child1;
retirementOther.child1OldId = org.result.child1Id;
retirementOther.child1DnaOldId = org.result.child1DnaId;
retirementOther.child1ShortNameOld = org.result.child1ShortName;
retirementOther.child2Old = org.result.child2;
retirementOther.child2OldId = org.result.child2Id;
retirementOther.child2DnaOldId = org.result.child2DnaId;
retirementOther.child2ShortNameOld = org.result.child2ShortName;
retirementOther.child3Old = org.result.child3;
retirementOther.child3OldId = org.result.child3Id;
retirementOther.child3DnaOldId = org.result.child3DnaId;
retirementOther.child3ShortNameOld = org.result.child3ShortName;
retirementOther.child4Old = org.result.child4;
retirementOther.child4OldId = org.result.child4Id;
retirementOther.child4DnaOldId = org.result.child4DnaId;
retirementOther.child4ShortNameOld = org.result.child4ShortName;
retirementOther.posMasterNoOld = org.result.posMasterNo;
retirementOther.posTypeOldId = org.result.posTypeId;

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

@ -295,18 +295,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.citizenId = org.result.citizenId;
retirementOut.rootOld = org.result.root;
retirementOut.rootOldId = org.result.rootId;
retirementOut.rootDnaOldId = org.result.rootDnaId;
retirementOut.rootShortNameOld = org.result.rootShortName;
retirementOut.child1Old = org.result.child1;
retirementOut.child1OldId = org.result.child1Id;
retirementOut.child1DnaOldId = org.result.child1DnaId;
retirementOut.child1ShortNameOld = org.result.child1ShortName;
retirementOut.child2Old = org.result.child2;
retirementOut.child2OldId = org.result.child2Id;
retirementOut.child2DnaOldId = org.result.child2DnaId;
retirementOut.child2ShortNameOld = org.result.child2ShortName;
retirementOut.child3Old = org.result.child3;
retirementOut.child3OldId = org.result.child3Id;
retirementOut.child3DnaOldId = org.result.child3DnaId;
retirementOut.child3ShortNameOld = org.result.child3ShortName;
retirementOut.child4Old = org.result.child4;
retirementOut.child4OldId = org.result.child4Id;
retirementOut.child4DnaOldId = org.result.child4DnaId;
retirementOut.child4ShortNameOld = org.result.child4ShortName;
retirementOut.posMasterNoOld = org.result.posMasterNo;
retirementOut.posTypeOldId = org.result.posTypeId;

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

@ -934,18 +934,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.citizenId = org.result.citizenId;
retirementResign.rootOld = org.result.root;
retirementResign.rootOldId = org.result.rootId;
retirementResign.rootDnaOldId = org.result.rootDnaId;
retirementResign.rootShortNameOld = org.result.rootShortName;
retirementResign.child1Old = org.result.child1;
retirementResign.child1OldId = org.result.child1Id;
retirementResign.child1DnaOldId = org.result.child1DnaId;
retirementResign.child1ShortNameOld = org.result.child1ShortName;
retirementResign.child2Old = org.result.child2;
retirementResign.child2OldId = org.result.child2Id;
retirementResign.child2DnaOldId = org.result.child2DnaId;
retirementResign.child2ShortNameOld = org.result.child2ShortName;
retirementResign.child3Old = org.result.child3;
retirementResign.child3OldId = org.result.child3Id;
retirementResign.child3DnaOldId = org.result.child3DnaId;
retirementResign.child3ShortNameOld = org.result.child3ShortName;
retirementResign.child4Old = org.result.child4;
retirementResign.child4OldId = org.result.child4Id;
retirementResign.child4DnaOldId = org.result.child4DnaId;
retirementResign.child4ShortNameOld = org.result.child4ShortName;
retirementResign.posMasterNoOld = org.result.posMasterNo;
retirementResign.posTypeOldId = org.result.posTypeId;

5
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -871,18 +871,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployee.citizenId = org.result.citizenId;
retirementResignEmployee.rootOld = org.result.root;
retirementResignEmployee.rootOldId = org.result.rootId;
retirementResignEmployee.rootDnaOldId = org.result.rootDnaId;
retirementResignEmployee.rootShortNameOld = org.result.rootShortName;
retirementResignEmployee.child1Old = org.result.child1;
retirementResignEmployee.child1OldId = org.result.child1Id;
retirementResignEmployee.child1DnaOldId = org.result.child1DnaId;
retirementResignEmployee.child1ShortNameOld = org.result.child1ShortName;
retirementResignEmployee.child2Old = org.result.child2;
retirementResignEmployee.child2OldId = org.result.child2Id;
retirementResignEmployee.child2DnaOldId = org.result.child2DnaId;
retirementResignEmployee.child2ShortNameOld = org.result.child2ShortName;
retirementResignEmployee.child3Old = org.result.child3;
retirementResignEmployee.child3OldId = org.result.child3Id;
retirementResignEmployee.child3DnaOldId = org.result.child3DnaId;
retirementResignEmployee.child3ShortNameOld = org.result.child3ShortName;
retirementResignEmployee.child4Old = org.result.child4;
retirementResignEmployee.child4OldId = org.result.child4Id;
retirementResignEmployee.child4DnaOldId = org.result.child4DnaId;
retirementResignEmployee.child4ShortNameOld = org.result.child4ShortName;
retirementResignEmployee.posMasterNoOld = org.result.posMasterNo;
retirementResignEmployee.posTypeOldId = org.result.posTypeId;

5
BMA.EHR.Retirement.Service/Requests/NodeAllRequest.cs
View file

@ -16,9 +16,14 @@ namespace BMA.EHR.Retirement.Service.Requests
{
public string? name { get; set; }
public string? rootId { get; set; }
public string? rootDnaId { get; set; }
public string? child1Id { get; set; }
public string? child1DnaId { get; set; }
public string? child2Id { get; set; }
public string? child2DnaId { get; set; }
public string? child3Id { get; set; }
public string? child3DnaId { get; set; }
public string? child4Id { get; set; }
public string? child4DnaId { get; set; }
}
}

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

@ -16,18 +16,23 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? citizenId { get; set; }
public string? root { get; set; }
public string? rootId { get; set; }
public string? rootDnaId { get; set; }
public string? rootShortName { get; set; }
public string? child1 { get; set; }
public string? child1Id { get; set; }
public string? child1DnaId { get; set; }
public string? child1ShortName { get; set; }
public string? child2 { get; set; }
public string? child2Id { get; set; }
public string? child2DnaId { get; set; }
public string? child2ShortName { get; set; }
public string? child3 { get; set; }
public string? child3Id { get; set; }
public string? child3DnaId { get; set; }
public string? child3ShortName { get; set; }
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4DnaId { get; set; }
public string? child4ShortName { get; set; }
public string? node { get; set; }
public string? nodeId { get; set; }