This commit is contained in:
parent
089e70c7c7
commit
e345331381
1 changed files with 38 additions and 0 deletions
|
|
@ -289,6 +289,7 @@ namespace BMA.EHR.Application.Repositories
|
|||
.OrderByDescending(x => x.Order).FirstOrDefault().Amount :
|
||||
p.Amount,
|
||||
PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
|
||||
ProfileInsignia = p.ProfileInsignia,
|
||||
Amount = p.Amount ?? 0,
|
||||
RootId = p.RootId,
|
||||
RootDnaId = p.RootDnaId,
|
||||
|
|
@ -763,6 +764,7 @@ namespace BMA.EHR.Application.Repositories
|
|||
.OrderByDescending(x => x.Order).FirstOrDefault().Amount :
|
||||
p.Amount,
|
||||
PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
|
||||
ProfileInsignia = p.ProfileInsignia,
|
||||
Amount = p.Amount ?? 0,
|
||||
RootId = p.RootId,
|
||||
RootDnaId = p.RootDnaId,
|
||||
|
|
@ -7867,6 +7869,23 @@ namespace BMA.EHR.Application.Repositories
|
|||
.OrderByDescending(x => x.Order).FirstOrDefault().Amount :
|
||||
p.Amount,
|
||||
PositionSalaryAmount = p.PositionSalaryAmount,
|
||||
ProfileInsignia = p.ProfileInsignia,
|
||||
Amount = p.Amount,
|
||||
RootId = p.RootId,
|
||||
RootDnaId = p.RootDnaId,
|
||||
Root = p.Root,
|
||||
Child1Id = p.Child1Id,
|
||||
Child1DnaId = p.Child1DnaId,
|
||||
Child1 = p.Child1,
|
||||
Child2Id = p.Child2Id,
|
||||
Child2DnaId = p.Child2DnaId,
|
||||
Child2 = p.Child2,
|
||||
Child3Id = p.Child3Id,
|
||||
Child3DnaId = p.Child3DnaId,
|
||||
Child3 = p.Child3,
|
||||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
});
|
||||
|
||||
// check วันที่บรรจะต้องมากกว่า 25 ปี
|
||||
|
|
@ -7898,6 +7917,25 @@ namespace BMA.EHR.Application.Repositories
|
|||
Seq = 1,
|
||||
Gender = p.Gender,
|
||||
MatchingConditions = new List<MatchingCondition>(),
|
||||
|
||||
|
||||
Amount = p.Amount,
|
||||
RootId = p.RootId,
|
||||
RootDnaId = p.RootDnaId,
|
||||
Root = p.Root,
|
||||
Child1Id = p.Child1Id,
|
||||
Child1DnaId = p.Child1DnaId,
|
||||
Child1 = p.Child1,
|
||||
Child2Id = p.Child2Id,
|
||||
Child2DnaId = p.Child2DnaId,
|
||||
Child2 = p.Child2,
|
||||
Child3Id = p.Child3Id,
|
||||
Child3DnaId = p.Child3DnaId,
|
||||
Child3 = p.Child3,
|
||||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
|
||||
})).ToList();
|
||||
|
||||
var result_candidate = new List<InsigniaResultSet>();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue