add dna
This commit is contained in:
kittapath
parent
dbe6916782
commit
5ea175ca77
61 changed files with 66329 additions and 129 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue