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

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

@ -527,18 +527,23 @@ namespace BMA.EHR.Placement.Service.Controllers
return Error("ไม่พบหน่วยงานนี้ในระบบ", 404);
uppdated.root = org.result.root;
uppdated.rootId = org.result.rootId;
uppdated.rootDnaId = org.result.rootDnaId;
uppdated.rootShortName = org.result.rootShortName;
uppdated.child1 = req.node <= 0 ? null : org.result.child1;
uppdated.child1Id = req.node <= 0 ? null : org.result.child1Id;
uppdated.child1DnaId = req.node <= 0 ? null : org.result.child1DnaId;
uppdated.child1ShortName = req.node <= 0 ? null : org.result.child1ShortName;
uppdated.child2 = req.node <= 1 ? null : org.result.child2;
uppdated.child2Id = req.node <= 1 ? null : org.result.child2Id;
uppdated.child2DnaId = req.node <= 1 ? null : org.result.child2DnaId;
uppdated.child2ShortName = req.node <= 1 ? null : org.result.child2ShortName;
uppdated.child3 = req.node <= 2 ? null : org.result.child3;
uppdated.child3Id = req.node <= 2 ? null : org.result.child3Id;
uppdated.child3DnaId = req.node <= 2 ? null : org.result.child3DnaId;
uppdated.child3ShortName = req.node <= 2 ? null : org.result.child3ShortName;
uppdated.child4 = req.node <= 3 ? null : org.result.child4;
uppdated.child4Id = req.node <= 3 ? null : org.result.child4Id;
uppdated.child4DnaId = req.node <= 3 ? null : org.result.child4DnaId;
uppdated.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
}
@ -961,11 +966,11 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfiles = await _context.PlacementAppointments
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.typeCommand = "MOVE";
});
placementProfiles.ForEach(profile =>
{
profile.Status = "REPORT";
profile.typeCommand = "MOVE";
});
await _context.SaveChangesAsync();
return Success();
}
@ -1844,6 +1849,10 @@ namespace BMA.EHR.Placement.Service.Controllers
rootId = profile.rootId,
rootShortName = profile.rootShortName,
rootDnaId = profile.rootDnaId,
child1DnaId = profile.child1DnaId,
child2DnaId = profile.child2DnaId,
child3DnaId = profile.child3DnaId,
child4DnaId = profile.child4DnaId,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",

5
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -559,18 +559,23 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.root = org.result.root;
uppdated.rootId = org.result.rootId;
uppdated.rootDnaId = org.result.rootDnaId;
uppdated.rootShortName = org.result.rootShortName;
uppdated.child1 = req.node <= 0 ? null : org.result.child1;
uppdated.child1Id = req.node <= 0 ? null : org.result.child1Id;
uppdated.child1DnaId = req.node <= 0 ? null : org.result.child1DnaId;
uppdated.child1ShortName = req.node <= 0 ? null : org.result.child1ShortName;
uppdated.child2 = req.node <= 1 ? null : org.result.child2;
uppdated.child2Id = req.node <= 1 ? null : org.result.child2Id;
uppdated.child2DnaId = req.node <= 1 ? null : org.result.child2DnaId;
uppdated.child2ShortName = req.node <= 1 ? null : org.result.child2ShortName;
uppdated.child3 = req.node <= 2 ? null : org.result.child3;
uppdated.child3Id = req.node <= 2 ? null : org.result.child3Id;
uppdated.child3DnaId = req.node <= 2 ? null : org.result.child3DnaId;
uppdated.child3ShortName = req.node <= 2 ? null : org.result.child3ShortName;
uppdated.child4 = req.node <= 3 ? null : org.result.child4;
uppdated.child4Id = req.node <= 3 ? null : org.result.child4Id;
uppdated.child4DnaId = req.node <= 3 ? null : org.result.child4DnaId;
uppdated.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
}

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

@ -810,18 +810,23 @@ namespace BMA.EHR.Placement.Service.Controllers
person.LastUpdatedAt = DateTime.Now;
person.root = null;
person.rootId = null;
person.rootDnaId = null;
person.rootShortName = null;
person.child1 = null;
person.child1Id = null;
person.child1DnaId = null;
person.child1ShortName = null;
person.child2 = null;
person.child2Id = null;
person.child2Id = null;
person.child2ShortName = null;
person.child3 = null;
person.child3Id = null;
person.child3DnaId = null;
person.child3ShortName = null;
person.child4 = null;
person.child4Id = null;
person.child4DnaId = null;
person.child4ShortName = null;
person.orgRevisionId = null;
person.posMasterNo = null;
@ -920,18 +925,23 @@ namespace BMA.EHR.Placement.Service.Controllers
person.root = org.result.root;
person.rootId = org.result.rootId;
person.rootDnaId = org.result.rootDnaId;
person.rootShortName = org.result.rootShortName;
person.child1 = req.node <= 0 ? null : org.result.child1;
person.child1Id = req.node <= 0 ? null : org.result.child1Id;
person.child1DnaId = req.node <= 0 ? null : org.result.child1DnaId;
person.child1ShortName = req.node <= 0 ? null : org.result.child1ShortName;
person.child2 = req.node <= 1 ? null : org.result.child2;
person.child2Id = req.node <= 1 ? null : org.result.child2Id;
person.child2DnaId = req.node <= 1 ? null : org.result.child2DnaId;
person.child2ShortName = req.node <= 1 ? null : org.result.child2ShortName;
person.child3 = req.node <= 2 ? null : org.result.child3;
person.child3Id = req.node <= 2 ? null : org.result.child3Id;
person.child3DnaId = req.node <= 2 ? null : org.result.child3DnaId;
person.child3ShortName = req.node <= 2 ? null : org.result.child3ShortName;
person.child4 = req.node <= 3 ? null : org.result.child4;
person.child4Id = req.node <= 3 ? null : org.result.child4Id;
person.child4DnaId = req.node <= 3 ? null : org.result.child4DnaId;
person.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
}
@ -1314,18 +1324,23 @@ namespace BMA.EHR.Placement.Service.Controllers
}
profile.root = null;
profile.rootId = null;
profile.rootDnaId = null;
profile.rootShortName = null;
profile.child1 = null;
profile.child1Id = null;
profile.child1DnaId = null;
profile.child1ShortName = null;
profile.child2 = null;
profile.child2Id = null;
profile.child2DnaId = null;
profile.child2ShortName = null;
profile.child3 = null;
profile.child3Id = null;
profile.child3DnaId = null;
profile.child3ShortName = null;
profile.child4 = null;
profile.child4Id = null;
profile.child4DnaId = null;
profile.child4ShortName = null;
profile.orgRevisionId = null;
profile.posMasterNo = null;
@ -2919,7 +2934,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.PlacementStatus.Trim().ToUpper() == "DONE")
.GroupBy(x => x.typeCommand.Trim().ToUpper())
.Select(g => new
@ -2933,7 +2952,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE" &&
x.type.Trim().ToUpper() == "OFFICER")
.GroupBy(x => x.typeCommand.Trim().ToUpper())
@ -2948,7 +2971,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -2956,7 +2983,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -2964,7 +2995,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -2972,7 +3007,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -2980,7 +3019,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -3018,7 +3061,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.PlacementStatus.Trim().ToUpper() == "DONE")
.GroupBy(x => x.typeCommand.Trim().ToUpper())
.Select(g => new
@ -3032,7 +3079,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE" &&
x.type.Trim().ToUpper() == "OFFICER")
.GroupBy(x => x.typeCommand.Trim().ToUpper())
@ -3047,7 +3098,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -3055,7 +3110,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -3063,7 +3122,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -3071,7 +3134,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -3079,7 +3146,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootOldId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaOldId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaOldId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaOldId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaOldId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaOldId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE")
.Count();
@ -3210,7 +3281,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE" &&
x.type.Trim().ToUpper() == "EMPLOYEE")
.GroupBy(x => x.typeCommand.Trim().ToUpper())
@ -3225,7 +3300,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId))
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true))
.Count();
//var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0;
@ -3251,7 +3330,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId) &&
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true) &&
x.Status.Trim().ToUpper() == "DONE" &&
x.type.Trim().ToUpper() == "EMPLOYEE")
.GroupBy(x => x.typeCommand.Trim().ToUpper())
@ -3266,7 +3349,11 @@ namespace BMA.EHR.Placement.Service.Controllers
.Where(x =>
x.CreatedAt.Date >= startDate &&
x.CreatedAt.Date <= endDate &&
x.rootId.Contains(item.rootId))
(node == 0 ? x.rootDnaId.Contains(item.rootDnaId) : true) &&
(node == 1 ? x.child1DnaId.Contains(item.child1DnaId) : true) &&
(node == 2 ? x.child2DnaId.Contains(item.child2DnaId) : true) &&
(node == 3 ? x.child3DnaId.Contains(item.child3DnaId) : true) &&
(node == 4 ? x.child4DnaId.Contains(item.child4DnaId) : true))
.Count();
//var pa_appoint = placementAppointments.FirstOrDefault(x => x.TypeCommand == "APPOINTED")?.Count ?? 0;

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

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

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

@ -628,18 +628,23 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.root = org.result.root;
uppdated.rootId = org.result.rootId;
uppdated.rootDnaId = org.result.rootDnaId;
uppdated.rootShortName = org.result.rootShortName;
uppdated.child1 = req.node <= 0 ? null : org.result.child1;
uppdated.child1Id = req.node <= 0 ? null : org.result.child1Id;
uppdated.child1DnaId = req.node <= 0 ? null : org.result.child1DnaId;
uppdated.child1ShortName = req.node <= 0 ? null : org.result.child1ShortName;
uppdated.child2 = req.node <= 1 ? null : org.result.child2;
uppdated.child2Id = req.node <= 1 ? null : org.result.child2Id;
uppdated.child2DnaId = req.node <= 1 ? null : org.result.child2DnaId;
uppdated.child2ShortName = req.node <= 1 ? null : org.result.child2ShortName;
uppdated.child3 = req.node <= 2 ? null : org.result.child3;
uppdated.child3Id = req.node <= 2 ? null : org.result.child3Id;
uppdated.child3DnaId = req.node <= 2 ? null : org.result.child3DnaId;
uppdated.child3ShortName = req.node <= 2 ? null : org.result.child3ShortName;
uppdated.child4 = req.node <= 3 ? null : org.result.child4;
uppdated.child4Id = req.node <= 3 ? null : org.result.child4Id;
uppdated.child4DnaId = req.node <= 3 ? null : org.result.child4DnaId;
uppdated.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
}

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

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

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

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

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

@ -16,9 +16,14 @@ namespace BMA.EHR.Placement.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.Placement.Service/Requests/OrgRequest.cs
View file

@ -18,18 +18,23 @@ namespace BMA.EHR.Placement.Service.Requests
public DateTime? birthDate { 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; }

4
BMA.EHR.Placement.Service/Requests/ReportExecutePlacementAppointRequest.cs
View file

@ -18,6 +18,10 @@ namespace BMA.EHR.Placement.Service.Requests
public string? rootId { get; set; }
public string? rootShortName { get; set; }
public string? rootDnaId { get; set; }
public string? child1DnaId { get; set; }
public string? child2DnaId { get; set; }
public string? child3DnaId { get; set; }
public string? child4DnaId { get; set; }
}
}