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

แก้วินัยผูก profile ใหม่

Browse source
This commit is contained in:
Kittapath 2024-05-24 01:12:27 +07:00
parent afe16503ee
commit b7f19d7077
36 changed files with 40179 additions and 978 deletions
Download patch file Download diff file Expand all files Collapse all files

66
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -292,6 +292,28 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
PersonId = p.PersonId,
PosNo = p.PosNo,
Organization = p.Organization,
root = p.root,
rootId = p.rootId,
rootShortName = p.rootShortName,
child1 = p.child1,
child1Id = p.child1Id,
child1ShortName = p.child1ShortName,
child2 = p.child2,
child2Id = p.child2Id,
child2ShortName = p.child2ShortName,
child3 = p.child3,
child3Id = p.child3Id,
child3ShortName = p.child3ShortName,
child4 = p.child4,
child4Id = p.child4Id,
child4ShortName = p.child4ShortName,
posMasterNo = p.posMasterNo,
posTypeId = p.posTypeId,
posTypeName = p.posTypeName,
posLevelId = p.posLevelId,
posLevelName = p.posLevelName,
IsSend = p.IsReport,
IsDisciplinary = p.IsDisciplinary,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
@ -457,6 +479,28 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
Salary = item.salary,
PersonId = item.personId,
root = item.root,
rootId = item.rootId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
posTypeName = item.posTypeName,
posLevelId = item.posLevelId,
posLevelName = item.posLevelName,
PosNo = item.posNo,
IsDisciplinary = isReport == null ? false : isReport.IsDisciplinary,
IsReport = isReport == null ? "NEW" : isReport.IsReport,
@ -577,6 +621,28 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
FirstName = item.FirstName,
LastName = item.LastName,
Organization = item.Organization,
root = item.root,
rootId = item.rootId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
posTypeName = item.posTypeName,
posLevelId = item.posLevelId,
posLevelName = item.posLevelName,
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,