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

87
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -146,6 +146,27 @@ namespace BMA.EHR.DisciplineComplaint.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,
}),//รายการข้อมูลบุคลผู้ถูกร้องเรียน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
ConsideredAgency = x.ConsideredAgency,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
@ -246,6 +267,28 @@ namespace BMA.EHR.DisciplineComplaint.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,
@ -323,6 +366,28 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
IsAncestorDNA = true,
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,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -449,6 +514,28 @@ namespace BMA.EHR.DisciplineComplaint.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,

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

@ -464,6 +464,28 @@ namespace BMA.EHR.DisciplineDisciplinary.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,
IsSuspend = p.IsSuspend,
Status = p.Status,
@ -692,6 +714,28 @@ namespace BMA.EHR.DisciplineDisciplinary.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,
Status = isReport == null ? "NEW" : isReport.Status,
StatusDiscard = isReport == null ? "NEW" : isReport.StatusDiscard,
@ -1620,6 +1664,28 @@ namespace BMA.EHR.DisciplineDisciplinary.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,

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,

20
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -134,6 +134,26 @@ namespace BMA.EHR.DisciplineResult.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,
Status = p.Status,
StatusDiscard = p.StatusDiscard,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน

42
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -74,7 +74,29 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
Prefix = x.Prefix,
FirstName = x.FirstName,
LastName = x.LastName,
Organization = x.Organization,
root = x.root,
rootId = x.rootId,
rootShortName = x.rootShortName,
child1 = x.child1,
child1Id = x.child1Id,
child1ShortName = x.child1ShortName,
child2 = x.child2,
child2Id = x.child2Id,
child2ShortName = x.child2ShortName,
child3 = x.child3,
child3Id = x.child3Id,
child3ShortName = x.child3ShortName,
child4 = x.child4,
child4Id = x.child4Id,
child4ShortName = x.child4ShortName,
posMasterNo = x.posMasterNo,
posTypeId = x.posTypeId,
posTypeName = x.posTypeName,
posLevelId = x.posLevelId,
posLevelName = x.posLevelName,
Position = x.Position,
PosNo = x.PosNo,
PositionLevel = x.PositionLevel,
@ -116,6 +138,26 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
FirstName = x.FirstName,
LastName = x.LastName,
Organization = x.Organization,
root = x.root,
rootId = x.rootId,
rootShortName = x.rootShortName,
child1 = x.child1,
child1Id = x.child1Id,
child1ShortName = x.child1ShortName,
child2 = x.child2,
child2Id = x.child2Id,
child2ShortName = x.child2ShortName,
child3 = x.child3,
child3Id = x.child3Id,
child3ShortName = x.child3ShortName,
child4 = x.child4,
child4Id = x.child4Id,
child4ShortName = x.child4ShortName,
posMasterNo = x.posMasterNo,
posTypeId = x.posTypeId,
posTypeName = x.posTypeName,
posLevelId = x.posLevelId,
posLevelName = x.posLevelName,
Position = x.Position,
PosNo = x.PosNo,
PositionLevel = x.PositionLevel,

23
BMA.EHR.Discipline.Service/Requests/DisciplineComplaintRequest.cs
View file

@ -22,7 +22,7 @@ namespace BMA.EHR.Discipline.Service.Requests
}
public class DisciplineComplaintProfileRequest
{
public Guid? personId { get; set; }
public string? personId { get; set; }
public string? idcard { get; set; }
public string? prefix { get; set; }
public string? firstName { get; set; }
@ -32,5 +32,26 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? positionLevel { get; set; }
public string? posNo { get; set; }
public double? salary { get; set; }
public string? root { get; set; }
public string? rootId { get; set; }
public string? rootShortName { get; set; }
public string? child1 { get; set; }
public string? child1Id { get; set; }
public string? child1ShortName { get; set; }
public string? child2 { get; set; }
public string? child2Id { get; set; }
public string? child2ShortName { get; set; }
public string? child3 { get; set; }
public string? child3Id { get; set; }
public string? child3ShortName { get; set; }
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4ShortName { get; set; }
public int? posMasterNo { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }
public string? posLevelId { get; set; }
public string? posLevelName { get; set; }
}
}

23
BMA.EHR.Discipline.Service/Requests/DisciplineDisciplinaryComplaintRequest.cs
View file

@ -11,7 +11,7 @@ namespace BMA.EHR.Discipline.Service.Requests
}
public class DisciplineDisciplinaryInvestigateComplaintProfileRequest
{
public Guid? personId { get; set; }
public string? personId { get; set; }
public string? idcard { get; set; }
public string? prefix { get; set; }
public string? firstName { get; set; }
@ -21,5 +21,26 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? positionLevel { get; set; }
public string? posNo { get; set; }
public double? salary { get; set; }
public string? root { get; set; }
public string? rootId { get; set; }
public string? rootShortName { get; set; }
public string? child1 { get; set; }
public string? child1Id { get; set; }
public string? child1ShortName { get; set; }
public string? child2 { get; set; }
public string? child2Id { get; set; }
public string? child2ShortName { get; set; }
public string? child3 { get; set; }
public string? child3Id { get; set; }
public string? child3ShortName { get; set; }
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4ShortName { get; set; }
public int? posMasterNo { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }
public string? posLevelId { get; set; }
public string? posLevelName { get; set; }
}
}

23
BMA.EHR.Discipline.Service/Requests/DisciplineInvestigateComplaintRequest.cs
View file

@ -11,7 +11,7 @@ namespace BMA.EHR.Discipline.Service.Requests
}
public class DisciplineInvestigateComplaintProfileRequest
{
public Guid? personId { get; set; }
public string? personId { get; set; }
public string? idcard { get; set; }
public string? prefix { get; set; }
public string? firstName { get; set; }
@ -21,5 +21,26 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? positionLevel { get; set; }
public string? posNo { get; set; }
public double? salary { get; set; }
public string? root { get; set; }
public string? rootId { get; set; }
public string? rootShortName { get; set; }
public string? child1 { get; set; }
public string? child1Id { get; set; }
public string? child1ShortName { get; set; }
public string? child2 { get; set; }
public string? child2Id { get; set; }
public string? child2ShortName { get; set; }
public string? child3 { get; set; }
public string? child3Id { get; set; }
public string? child3ShortName { get; set; }
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4ShortName { get; set; }
public int? posMasterNo { get; set; }
public string? posTypeId { get; set; }
public string? posTypeName { get; set; }
public string? posLevelId { get; set; }
public string? posLevelName { get; set; }
}
}