แก้วินัยผูก profile ใหม่
This commit is contained in:
Kittapath
parent
afe16503ee
commit
b7f19d7077
36 changed files with 40179 additions and 978 deletions
36
.github/workflows/release_command.yaml
vendored
36
.github/workflows/release_command.yaml
vendored
|
|
@ -68,21 +68,21 @@ jobs:
|
||||||
docker compose pull
|
docker compose pull
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
|
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
|
||||||
- uses: snow-actions/line-notify@v1.1.0
|
# - uses: snow-actions/line-notify@v1.1.0
|
||||||
if: success()
|
# if: success()
|
||||||
with:
|
# with:
|
||||||
access_token: ${{ env.TOKEN_LINE }}
|
# access_token: ${{ env.TOKEN_LINE }}
|
||||||
message: |
|
# message: |
|
||||||
-Success✅✅✅
|
# -Success✅✅✅
|
||||||
Image: ${{env.IMAGE_NAME}}
|
# Image: ${{env.IMAGE_NAME}}
|
||||||
Version: ${{ github.event.inputs.IMAGE_VER }}
|
# Version: ${{ github.event.inputs.IMAGE_VER }}
|
||||||
By: ${{secrets.DOCKER_USER}}
|
# By: ${{secrets.DOCKER_USER}}
|
||||||
- uses: snow-actions/line-notify@v1.1.0
|
# - uses: snow-actions/line-notify@v1.1.0
|
||||||
if: failure()
|
# if: failure()
|
||||||
with:
|
# with:
|
||||||
access_token: ${{ env.TOKEN_LINE }}
|
# access_token: ${{ env.TOKEN_LINE }}
|
||||||
message: |
|
# message: |
|
||||||
-Failure❌❌❌
|
# -Failure❌❌❌
|
||||||
Image: ${{env.IMAGE_NAME}}
|
# Image: ${{env.IMAGE_NAME}}
|
||||||
Version: ${{ github.event.inputs.IMAGE_VER }}
|
# Version: ${{ github.event.inputs.IMAGE_VER }}
|
||||||
By: ${{secrets.DOCKER_USER}}
|
# By: ${{secrets.DOCKER_USER}}
|
||||||
|
|
|
||||||
36
.github/workflows/release_discipline.yaml
vendored
36
.github/workflows/release_discipline.yaml
vendored
|
|
@ -68,21 +68,21 @@ jobs:
|
||||||
docker compose pull
|
docker compose pull
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
|
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
|
||||||
- uses: snow-actions/line-notify@v1.1.0
|
# - uses: snow-actions/line-notify@v1.1.0
|
||||||
if: success()
|
# if: success()
|
||||||
with:
|
# with:
|
||||||
access_token: ${{ env.TOKEN_LINE }}
|
# access_token: ${{ env.TOKEN_LINE }}
|
||||||
message: |
|
# message: |
|
||||||
-Success✅✅✅
|
# -Success✅✅✅
|
||||||
Image: ${{env.IMAGE_NAME}}
|
# Image: ${{env.IMAGE_NAME}}
|
||||||
Version: ${{ github.event.inputs.IMAGE_VER }}
|
# Version: ${{ github.event.inputs.IMAGE_VER }}
|
||||||
By: ${{secrets.DOCKER_USER}}
|
# By: ${{secrets.DOCKER_USER}}
|
||||||
- uses: snow-actions/line-notify@v1.1.0
|
# - uses: snow-actions/line-notify@v1.1.0
|
||||||
if: failure()
|
# if: failure()
|
||||||
with:
|
# with:
|
||||||
access_token: ${{ env.TOKEN_LINE }}
|
# access_token: ${{ env.TOKEN_LINE }}
|
||||||
message: |
|
# message: |
|
||||||
-Failure❌❌❌
|
# -Failure❌❌❌
|
||||||
Image: ${{env.IMAGE_NAME}}
|
# Image: ${{env.IMAGE_NAME}}
|
||||||
Version: ${{ github.event.inputs.IMAGE_VER }}
|
# Version: ${{ github.event.inputs.IMAGE_VER }}
|
||||||
By: ${{secrets.DOCKER_USER}}
|
# By: ${{secrets.DOCKER_USER}}
|
||||||
|
|
|
||||||
36
.github/workflows/release_report.yaml
vendored
36
.github/workflows/release_report.yaml
vendored
|
|
@ -68,21 +68,21 @@ jobs:
|
||||||
docker compose pull
|
docker compose pull
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
|
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
|
||||||
- uses: snow-actions/line-notify@v1.1.0
|
# - uses: snow-actions/line-notify@v1.1.0
|
||||||
if: success()
|
# if: success()
|
||||||
with:
|
# with:
|
||||||
access_token: ${{ env.TOKEN_LINE }}
|
# access_token: ${{ env.TOKEN_LINE }}
|
||||||
message: |
|
# message: |
|
||||||
-Success✅✅✅
|
# -Success✅✅✅
|
||||||
Image: ${{env.IMAGE_NAME}}
|
# Image: ${{env.IMAGE_NAME}}
|
||||||
Version: ${{ github.event.inputs.IMAGE_VER }}
|
# Version: ${{ github.event.inputs.IMAGE_VER }}
|
||||||
By: ${{secrets.DOCKER_USER}}
|
# By: ${{secrets.DOCKER_USER}}
|
||||||
- uses: snow-actions/line-notify@v1.1.0
|
# - uses: snow-actions/line-notify@v1.1.0
|
||||||
if: failure()
|
# if: failure()
|
||||||
with:
|
# with:
|
||||||
access_token: ${{ env.TOKEN_LINE }}
|
# access_token: ${{ env.TOKEN_LINE }}
|
||||||
message: |
|
# message: |
|
||||||
-Failure❌❌❌
|
# -Failure❌❌❌
|
||||||
Image: ${{env.IMAGE_NAME}}
|
# Image: ${{env.IMAGE_NAME}}
|
||||||
Version: ${{ github.event.inputs.IMAGE_VER }}
|
# Version: ${{ github.event.inputs.IMAGE_VER }}
|
||||||
By: ${{secrets.DOCKER_USER}}
|
# By: ${{secrets.DOCKER_USER}}
|
||||||
|
|
|
||||||
|
|
@ -846,7 +846,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
||||||
Seq = r.Sequence.ToString().ToThaiNumber(),
|
Seq = r.Sequence.ToString().ToThaiNumber(),
|
||||||
CitizenId = r.CitizenId,
|
CitizenId = r.CitizenId,
|
||||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||||
PositionName = p.position ?? "",
|
PositionName = p.PositionOld ?? "",
|
||||||
Organization = p.OrganizationPositionOld ?? "",
|
Organization = p.OrganizationPositionOld ?? "",
|
||||||
PositionLevel = p.PositionLevelOld ?? "",
|
PositionLevel = p.PositionLevelOld ?? "",
|
||||||
PositionType = p.PositionTypeOld ?? "",
|
PositionType = p.PositionTypeOld ?? "",
|
||||||
|
|
@ -1197,7 +1197,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
||||||
CitizenId = r.CitizenId.ToThaiNumber(),
|
CitizenId = r.CitizenId.ToThaiNumber(),
|
||||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||||
Organization = p.OrganizationPositionOld ?? "",
|
Organization = p.OrganizationPositionOld ?? "",
|
||||||
PositionName = p.position ?? "",
|
PositionName = p.PositionOld ?? "",
|
||||||
PositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld.ToThaiNumber(),
|
PositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld.ToThaiNumber(),
|
||||||
PositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld.ToThaiNumber(),
|
PositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld.ToThaiNumber(),
|
||||||
PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(),
|
PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(),
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
Subject3 = $"ตรวจสอบหนี้สินและภาระผูกพันของข้าราชการ",
|
Subject3 = $"ตรวจสอบหนี้สินและภาระผูกพันของข้าราชการ",
|
||||||
Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร 173 ถนนดินสอ กทม. 10200",
|
Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร 173 ถนนดินสอ กทม. 10200",
|
||||||
Name = $"{data.prefix}{data.firstName} {data.lastName}",
|
Name = $"{data.prefix}{data.firstName} {data.lastName}",
|
||||||
Position = $"{data.position}",
|
Position = $"{data.PositionOld}",
|
||||||
OrganizationOrganization = $"{data.Organization}",
|
OrganizationOrganization = $"{data.Organization}",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -110,7 +110,7 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
Subject3 = $"ตรวจสอบภาระผูกพันกับกรุงเทพมหานครเกี่ยวกับการลาศึกษา อบรม ของข้าราชการ",
|
Subject3 = $"ตรวจสอบภาระผูกพันกับกรุงเทพมหานครเกี่ยวกับการลาศึกษา อบรม ของข้าราชการ",
|
||||||
Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร 173 ถนนดินสอ กทม. 10200",
|
Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร 173 ถนนดินสอ กทม. 10200",
|
||||||
Name = $"{data.prefix}{data.firstName} {data.lastName}",
|
Name = $"{data.prefix}{data.firstName} {data.lastName}",
|
||||||
Position = $"{data.position}",
|
Position = $"{data.PositionOld}",
|
||||||
OrganizationOrganization = $"{data.Organization}",
|
OrganizationOrganization = $"{data.Organization}",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -133,7 +133,7 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
Subject5 = $"ตรวจสอบหนี้สินและภาระผูกพันของข้าราชการ",
|
Subject5 = $"ตรวจสอบหนี้สินและภาระผูกพันของข้าราชการ",
|
||||||
Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร 173 ถนนดินสอ กทม. 10200",
|
Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร 173 ถนนดินสอ กทม. 10200",
|
||||||
Name = $"{data.prefix}{data.firstName} {data.lastName}",
|
Name = $"{data.prefix}{data.firstName} {data.lastName}",
|
||||||
Position = $"{data.position}",
|
Position = $"{data.PositionOld}",
|
||||||
OrganizationOrganization = $"{data.Organization}",
|
OrganizationOrganization = $"{data.Organization}",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -146,6 +146,27 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
|
||||||
PersonId = p.PersonId,
|
PersonId = p.PersonId,
|
||||||
PosNo = p.PosNo,
|
PosNo = p.PosNo,
|
||||||
Organization = p.Organization,
|
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 เป็นหน่วยงาน
|
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
|
||||||
ConsideredAgency = x.ConsideredAgency,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
|
ConsideredAgency = x.ConsideredAgency,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
|
||||||
|
|
@ -246,6 +267,28 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
|
||||||
FirstName = item.firstName,
|
FirstName = item.firstName,
|
||||||
LastName = item.lastName,
|
LastName = item.lastName,
|
||||||
Organization = item.organization,
|
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,
|
Salary = item.salary,
|
||||||
PosNo = item.posNo,
|
PosNo = item.posNo,
|
||||||
Position = item.position,
|
Position = item.position,
|
||||||
|
|
@ -323,6 +366,28 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
|
||||||
IsAncestorDNA = true,
|
IsAncestorDNA = true,
|
||||||
Salary = item.salary,
|
Salary = item.salary,
|
||||||
PersonId = item.personId,
|
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,
|
PosNo = item.posNo,
|
||||||
CreatedFullName = FullName ?? "System Administrator",
|
CreatedFullName = FullName ?? "System Administrator",
|
||||||
CreatedUserId = UserId ?? "",
|
CreatedUserId = UserId ?? "",
|
||||||
|
|
@ -449,6 +514,28 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
|
||||||
FirstName = item.FirstName,
|
FirstName = item.FirstName,
|
||||||
LastName = item.LastName,
|
LastName = item.LastName,
|
||||||
Organization = item.Organization,
|
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,
|
Salary = item.Salary,
|
||||||
PosNo = item.PosNo,
|
PosNo = item.PosNo,
|
||||||
Position = item.Position,
|
Position = item.Position,
|
||||||
|
|
|
||||||
|
|
@ -464,6 +464,28 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
||||||
PersonId = p.PersonId,
|
PersonId = p.PersonId,
|
||||||
PosNo = p.PosNo,
|
PosNo = p.PosNo,
|
||||||
Organization = p.Organization,
|
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,
|
IsSend = p.IsReport,
|
||||||
IsSuspend = p.IsSuspend,
|
IsSuspend = p.IsSuspend,
|
||||||
Status = p.Status,
|
Status = p.Status,
|
||||||
|
|
@ -692,6 +714,28 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
||||||
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
|
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
|
||||||
Salary = item.salary,
|
Salary = item.salary,
|
||||||
PersonId = item.personId,
|
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,
|
PosNo = item.posNo,
|
||||||
Status = isReport == null ? "NEW" : isReport.Status,
|
Status = isReport == null ? "NEW" : isReport.Status,
|
||||||
StatusDiscard = isReport == null ? "NEW" : isReport.StatusDiscard,
|
StatusDiscard = isReport == null ? "NEW" : isReport.StatusDiscard,
|
||||||
|
|
@ -1620,6 +1664,28 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
||||||
FirstName = item.FirstName,
|
FirstName = item.FirstName,
|
||||||
LastName = item.LastName,
|
LastName = item.LastName,
|
||||||
Organization = item.Organization,
|
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,
|
Salary = item.Salary,
|
||||||
PosNo = item.PosNo,
|
PosNo = item.PosNo,
|
||||||
Position = item.Position,
|
Position = item.Position,
|
||||||
|
|
|
||||||
|
|
@ -292,6 +292,28 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
||||||
PersonId = p.PersonId,
|
PersonId = p.PersonId,
|
||||||
PosNo = p.PosNo,
|
PosNo = p.PosNo,
|
||||||
Organization = p.Organization,
|
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,
|
IsSend = p.IsReport,
|
||||||
IsDisciplinary = p.IsDisciplinary,
|
IsDisciplinary = p.IsDisciplinary,
|
||||||
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
||||||
|
|
@ -457,6 +479,28 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
||||||
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
|
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
|
||||||
Salary = item.salary,
|
Salary = item.salary,
|
||||||
PersonId = item.personId,
|
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,
|
PosNo = item.posNo,
|
||||||
IsDisciplinary = isReport == null ? false : isReport.IsDisciplinary,
|
IsDisciplinary = isReport == null ? false : isReport.IsDisciplinary,
|
||||||
IsReport = isReport == null ? "NEW" : isReport.IsReport,
|
IsReport = isReport == null ? "NEW" : isReport.IsReport,
|
||||||
|
|
@ -577,6 +621,28 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
||||||
FirstName = item.FirstName,
|
FirstName = item.FirstName,
|
||||||
LastName = item.LastName,
|
LastName = item.LastName,
|
||||||
Organization = item.Organization,
|
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,
|
Salary = item.Salary,
|
||||||
PosNo = item.PosNo,
|
PosNo = item.PosNo,
|
||||||
Position = item.Position,
|
Position = item.Position,
|
||||||
|
|
|
||||||
|
|
@ -134,6 +134,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
||||||
PersonId = p.PersonId,
|
PersonId = p.PersonId,
|
||||||
PosNo = p.PosNo,
|
PosNo = p.PosNo,
|
||||||
Organization = p.Organization,
|
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,
|
Status = p.Status,
|
||||||
StatusDiscard = p.StatusDiscard,
|
StatusDiscard = p.StatusDiscard,
|
||||||
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,29 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
||||||
Prefix = x.Prefix,
|
Prefix = x.Prefix,
|
||||||
FirstName = x.FirstName,
|
FirstName = x.FirstName,
|
||||||
LastName = x.LastName,
|
LastName = x.LastName,
|
||||||
|
|
||||||
Organization = x.Organization,
|
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,
|
Position = x.Position,
|
||||||
PosNo = x.PosNo,
|
PosNo = x.PosNo,
|
||||||
PositionLevel = x.PositionLevel,
|
PositionLevel = x.PositionLevel,
|
||||||
|
|
@ -116,6 +138,26 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
||||||
FirstName = x.FirstName,
|
FirstName = x.FirstName,
|
||||||
LastName = x.LastName,
|
LastName = x.LastName,
|
||||||
Organization = x.Organization,
|
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,
|
Position = x.Position,
|
||||||
PosNo = x.PosNo,
|
PosNo = x.PosNo,
|
||||||
PositionLevel = x.PositionLevel,
|
PositionLevel = x.PositionLevel,
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ namespace BMA.EHR.Discipline.Service.Requests
|
||||||
}
|
}
|
||||||
public class DisciplineComplaintProfileRequest
|
public class DisciplineComplaintProfileRequest
|
||||||
{
|
{
|
||||||
public Guid? personId { get; set; }
|
public string? personId { get; set; }
|
||||||
public string? idcard { get; set; }
|
public string? idcard { get; set; }
|
||||||
public string? prefix { get; set; }
|
public string? prefix { get; set; }
|
||||||
public string? firstName { get; set; }
|
public string? firstName { get; set; }
|
||||||
|
|
@ -32,5 +32,26 @@ namespace BMA.EHR.Discipline.Service.Requests
|
||||||
public string? positionLevel { get; set; }
|
public string? positionLevel { get; set; }
|
||||||
public string? posNo { get; set; }
|
public string? posNo { get; set; }
|
||||||
public double? salary { 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; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ namespace BMA.EHR.Discipline.Service.Requests
|
||||||
}
|
}
|
||||||
public class DisciplineDisciplinaryInvestigateComplaintProfileRequest
|
public class DisciplineDisciplinaryInvestigateComplaintProfileRequest
|
||||||
{
|
{
|
||||||
public Guid? personId { get; set; }
|
public string? personId { get; set; }
|
||||||
public string? idcard { get; set; }
|
public string? idcard { get; set; }
|
||||||
public string? prefix { get; set; }
|
public string? prefix { get; set; }
|
||||||
public string? firstName { get; set; }
|
public string? firstName { get; set; }
|
||||||
|
|
@ -21,5 +21,26 @@ namespace BMA.EHR.Discipline.Service.Requests
|
||||||
public string? positionLevel { get; set; }
|
public string? positionLevel { get; set; }
|
||||||
public string? posNo { get; set; }
|
public string? posNo { get; set; }
|
||||||
public double? salary { 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; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ namespace BMA.EHR.Discipline.Service.Requests
|
||||||
}
|
}
|
||||||
public class DisciplineInvestigateComplaintProfileRequest
|
public class DisciplineInvestigateComplaintProfileRequest
|
||||||
{
|
{
|
||||||
public Guid? personId { get; set; }
|
public string? personId { get; set; }
|
||||||
public string? idcard { get; set; }
|
public string? idcard { get; set; }
|
||||||
public string? prefix { get; set; }
|
public string? prefix { get; set; }
|
||||||
public string? firstName { get; set; }
|
public string? firstName { get; set; }
|
||||||
|
|
@ -21,5 +21,26 @@ namespace BMA.EHR.Discipline.Service.Requests
|
||||||
public string? positionLevel { get; set; }
|
public string? positionLevel { get; set; }
|
||||||
public string? posNo { get; set; }
|
public string? posNo { get; set; }
|
||||||
public double? salary { 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; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public class DisciplineComplaint_Profile : EntityBase
|
public class DisciplineComplaint_Profile : EntityBase
|
||||||
{
|
{
|
||||||
[Comment("id อ้างอิง profile")]
|
[Comment("id อ้างอิง profile")]
|
||||||
public Guid? PersonId { get; set; }
|
public string? PersonId { get; set; }
|
||||||
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
||||||
public string? CitizenId { get; set; }
|
public string? CitizenId { get; set; }
|
||||||
[Comment("คำนำหน้า")]
|
[Comment("คำนำหน้า")]
|
||||||
|
|
@ -21,6 +21,46 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public string? LastName { get; set; }
|
public string? LastName { get; set; }
|
||||||
[Comment("สังกัด")]
|
[Comment("สังกัด")]
|
||||||
public string? Organization { get; set; }
|
public string? Organization { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน root")]
|
||||||
|
public string? root { get; set; }
|
||||||
|
[Comment("id หน่วยงาน root")]
|
||||||
|
public string? rootId { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน root")]
|
||||||
|
public string? rootShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child1")]
|
||||||
|
public string? child1 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child1")]
|
||||||
|
public string? child1Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child1")]
|
||||||
|
public string? child1ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child2")]
|
||||||
|
public string? child2 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child2")]
|
||||||
|
public string? child2Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child2")]
|
||||||
|
public string? child2ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child3")]
|
||||||
|
public string? child3 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child3")]
|
||||||
|
public string? child3Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child3")]
|
||||||
|
public string? child3ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child4")]
|
||||||
|
public string? child4 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child4")]
|
||||||
|
public string? child4Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child4")]
|
||||||
|
public string? child4ShortName { get; set; }
|
||||||
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
public int? posMasterNo { get; set; }
|
||||||
|
[Comment("id ประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeId { get; set; }
|
||||||
|
[Comment("ชื่อประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeName { get; set; }
|
||||||
|
[Comment("id ระดับตำแหน่ง")]
|
||||||
|
public string? posLevelId { get; set; }
|
||||||
|
[Comment("ชื่อระดับตำแหน่ง")]
|
||||||
|
public string? posLevelName { get; set; }
|
||||||
[Comment("ตำแหน่ง")]
|
[Comment("ตำแหน่ง")]
|
||||||
public string? Position { get; set; }
|
public string? Position { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public class DisciplineDisciplinary_ProfileComplaintInvestigate : EntityBase
|
public class DisciplineDisciplinary_ProfileComplaintInvestigate : EntityBase
|
||||||
{
|
{
|
||||||
[Comment("id อ้างอิง profile")]
|
[Comment("id อ้างอิง profile")]
|
||||||
public Guid? PersonId { get; set; }
|
public string? PersonId { get; set; }
|
||||||
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
||||||
public string? CitizenId { get; set; }
|
public string? CitizenId { get; set; }
|
||||||
[Comment("คำนำหน้า")]
|
[Comment("คำนำหน้า")]
|
||||||
|
|
@ -21,6 +21,46 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public string? LastName { get; set; }
|
public string? LastName { get; set; }
|
||||||
[Comment("สังกัด")]
|
[Comment("สังกัด")]
|
||||||
public string? Organization { get; set; }
|
public string? Organization { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน root")]
|
||||||
|
public string? root { get; set; }
|
||||||
|
[Comment("id หน่วยงาน root")]
|
||||||
|
public string? rootId { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน root")]
|
||||||
|
public string? rootShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child1")]
|
||||||
|
public string? child1 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child1")]
|
||||||
|
public string? child1Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child1")]
|
||||||
|
public string? child1ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child2")]
|
||||||
|
public string? child2 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child2")]
|
||||||
|
public string? child2Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child2")]
|
||||||
|
public string? child2ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child3")]
|
||||||
|
public string? child3 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child3")]
|
||||||
|
public string? child3Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child3")]
|
||||||
|
public string? child3ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child4")]
|
||||||
|
public string? child4 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child4")]
|
||||||
|
public string? child4Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child4")]
|
||||||
|
public string? child4ShortName { get; set; }
|
||||||
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
public int? posMasterNo { get; set; }
|
||||||
|
[Comment("id ประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeId { get; set; }
|
||||||
|
[Comment("ชื่อประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeName { get; set; }
|
||||||
|
[Comment("id ระดับตำแหน่ง")]
|
||||||
|
public string? posLevelId { get; set; }
|
||||||
|
[Comment("ชื่อระดับตำแหน่ง")]
|
||||||
|
public string? posLevelName { get; set; }
|
||||||
[Comment("ตำแหน่ง")]
|
[Comment("ตำแหน่ง")]
|
||||||
public string? Position { get; set; }
|
public string? Position { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public class DisciplineInvestigate_ProfileComplaint : EntityBase
|
public class DisciplineInvestigate_ProfileComplaint : EntityBase
|
||||||
{
|
{
|
||||||
[Comment("id อ้างอิง profile")]
|
[Comment("id อ้างอิง profile")]
|
||||||
public Guid? PersonId { get; set; }
|
public string? PersonId { get; set; }
|
||||||
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
||||||
public string? CitizenId { get; set; }
|
public string? CitizenId { get; set; }
|
||||||
[Comment("คำนำหน้า")]
|
[Comment("คำนำหน้า")]
|
||||||
|
|
@ -21,6 +21,46 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public string? LastName { get; set; }
|
public string? LastName { get; set; }
|
||||||
[Comment("สังกัด")]
|
[Comment("สังกัด")]
|
||||||
public string? Organization { get; set; }
|
public string? Organization { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน root")]
|
||||||
|
public string? root { get; set; }
|
||||||
|
[Comment("id หน่วยงาน root")]
|
||||||
|
public string? rootId { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน root")]
|
||||||
|
public string? rootShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child1")]
|
||||||
|
public string? child1 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child1")]
|
||||||
|
public string? child1Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child1")]
|
||||||
|
public string? child1ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child2")]
|
||||||
|
public string? child2 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child2")]
|
||||||
|
public string? child2Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child2")]
|
||||||
|
public string? child2ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child3")]
|
||||||
|
public string? child3 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child3")]
|
||||||
|
public string? child3Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child3")]
|
||||||
|
public string? child3ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child4")]
|
||||||
|
public string? child4 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child4")]
|
||||||
|
public string? child4Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child4")]
|
||||||
|
public string? child4ShortName { get; set; }
|
||||||
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
public int? posMasterNo { get; set; }
|
||||||
|
[Comment("id ประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeId { get; set; }
|
||||||
|
[Comment("ชื่อประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeName { get; set; }
|
||||||
|
[Comment("id ระดับตำแหน่ง")]
|
||||||
|
public string? posLevelId { get; set; }
|
||||||
|
[Comment("ชื่อระดับตำแหน่ง")]
|
||||||
|
public string? posLevelName { get; set; }
|
||||||
[Comment("ตำแหน่ง")]
|
[Comment("ตำแหน่ง")]
|
||||||
public string? Position { get; set; }
|
public string? Position { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public class DisciplineReport_Profile : EntityBase
|
public class DisciplineReport_Profile : EntityBase
|
||||||
{
|
{
|
||||||
[Comment("id อ้างอิง profile")]
|
[Comment("id อ้างอิง profile")]
|
||||||
public Guid? PersonId { get; set; }
|
public string? PersonId { get; set; }
|
||||||
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
|
||||||
public string? CitizenId { get; set; }
|
public string? CitizenId { get; set; }
|
||||||
[Comment("คำนำหน้า")]
|
[Comment("คำนำหน้า")]
|
||||||
|
|
@ -21,6 +21,46 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
public string? LastName { get; set; }
|
public string? LastName { get; set; }
|
||||||
[Comment("สังกัด")]
|
[Comment("สังกัด")]
|
||||||
public string? Organization { get; set; }
|
public string? Organization { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน root")]
|
||||||
|
public string? root { get; set; }
|
||||||
|
[Comment("id หน่วยงาน root")]
|
||||||
|
public string? rootId { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน root")]
|
||||||
|
public string? rootShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child1")]
|
||||||
|
public string? child1 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child1")]
|
||||||
|
public string? child1Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child1")]
|
||||||
|
public string? child1ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child2")]
|
||||||
|
public string? child2 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child2")]
|
||||||
|
public string? child2Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child2")]
|
||||||
|
public string? child2ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child3")]
|
||||||
|
public string? child3 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child3")]
|
||||||
|
public string? child3Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child3")]
|
||||||
|
public string? child3ShortName { get; set; }
|
||||||
|
[Comment("ชื่อหน่วยงาน child4")]
|
||||||
|
public string? child4 { get; set; }
|
||||||
|
[Comment("id หน่วยงาน child4")]
|
||||||
|
public string? child4Id { get; set; }
|
||||||
|
[Comment("ชื่อย่อหน่วยงาน child4")]
|
||||||
|
public string? child4ShortName { get; set; }
|
||||||
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
public int? posMasterNo { get; set; }
|
||||||
|
[Comment("id ประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeId { get; set; }
|
||||||
|
[Comment("ชื่อประเภทตำแหน่ง")]
|
||||||
|
public string? posTypeName { get; set; }
|
||||||
|
[Comment("id ระดับตำแหน่ง")]
|
||||||
|
public string? posLevelId { get; set; }
|
||||||
|
[Comment("ชื่อระดับตำแหน่ง")]
|
||||||
|
public string? posLevelName { get; set; }
|
||||||
[Comment("ตำแหน่ง")]
|
[Comment("ตำแหน่ง")]
|
||||||
public string? Position { get; set; }
|
public string? Position { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
[Comment("เลขที่ตำแหน่ง")]
|
||||||
|
|
|
||||||
|
|
@ -46,50 +46,48 @@ namespace BMA.EHR.Domain.Models.Placement
|
||||||
public string? lastName { get; set; }
|
public string? lastName { get; set; }
|
||||||
[Comment("เลขบัตรประชาชน")]
|
[Comment("เลขบัตรประชาชน")]
|
||||||
public string? citizenId { get; set; }
|
public string? citizenId { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน root")]
|
[Comment("ชื่อหน่วยงาน root old")]
|
||||||
public string? root { get; set; }
|
public string? rootOld { get; set; }
|
||||||
[Comment("id หน่วยงาน root")]
|
[Comment("id หน่วยงาน root old")]
|
||||||
public string? rootId { get; set; }
|
public string? rootOldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน root")]
|
[Comment("ชื่อย่อหน่วยงาน root old")]
|
||||||
public string? rootShortName { get; set; }
|
public string? rootShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child1")]
|
[Comment("ชื่อหน่วยงาน child1 old")]
|
||||||
public string? child1 { get; set; }
|
public string? child1Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child1")]
|
[Comment("id หน่วยงาน child1 old")]
|
||||||
public string? child1Id { get; set; }
|
public string? child1OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child1")]
|
[Comment("ชื่อย่อหน่วยงาน child1 old")]
|
||||||
public string? child1ShortName { get; set; }
|
public string? child1ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child2")]
|
[Comment("ชื่อหน่วยงาน child2 old")]
|
||||||
public string? child2 { get; set; }
|
public string? child2Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child2")]
|
[Comment("id หน่วยงาน child2 old")]
|
||||||
public string? child2Id { get; set; }
|
public string? child2OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child2")]
|
[Comment("ชื่อย่อหน่วยงาน child2 old")]
|
||||||
public string? child2ShortName { get; set; }
|
public string? child2ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child3")]
|
[Comment("ชื่อหน่วยงาน child3 old")]
|
||||||
public string? child3 { get; set; }
|
public string? child3Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child3")]
|
[Comment("id หน่วยงาน child3 old")]
|
||||||
public string? child3Id { get; set; }
|
public string? child3OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child3")]
|
[Comment("ชื่อย่อหน่วยงาน child3 old")]
|
||||||
public string? child3ShortName { get; set; }
|
public string? child3ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child4")]
|
[Comment("ชื่อหน่วยงาน child4 old")]
|
||||||
public string? child4 { get; set; }
|
public string? child4Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child4")]
|
[Comment("id หน่วยงาน child4 old")]
|
||||||
public string? child4Id { get; set; }
|
public string? child4OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child4")]
|
[Comment("ชื่อย่อหน่วยงาน child4 old")]
|
||||||
public string? child4ShortName { get; set; }
|
public string? child4ShortNameOld { get; set; }
|
||||||
// [Comment("id revision")]
|
[Comment("เลขที่ตำแหน่ง old")]
|
||||||
// public string? orgRevisionId { get; set; }
|
public int? posMasterNoOld { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
// [Comment("ชื่อตำแหน่งในสายงาน old")]
|
||||||
public int? posMasterNo { get; set; }
|
// public string? positionOld { get; set; }
|
||||||
[Comment("ชื่อตำแหน่งในสายงาน")]
|
[Comment("id ประเภทตำแหน่ง old")]
|
||||||
public string? position { get; set; }
|
public string? posTypeOldId { get; set; }
|
||||||
[Comment("id ประเภทตำแหน่ง")]
|
[Comment("ชื่อประเภทตำแหน่ง old")]
|
||||||
public string? posTypeId { get; set; }
|
public string? posTypeNameOld { get; set; }
|
||||||
[Comment("ชื่อประเภทตำแหน่ง")]
|
[Comment("id ระดับตำแหน่ง old")]
|
||||||
public string? posTypeName { get; set; }
|
public string? posLevelOldId { get; set; }
|
||||||
[Comment("id ระดับตำแหน่ง")]
|
[Comment("ชื่อระดับตำแหน่ง old")]
|
||||||
public string? posLevelId { get; set; }
|
public string? posLevelNameOld { get; set; }
|
||||||
[Comment("ชื่อระดับตำแหน่ง")]
|
|
||||||
public string? posLevelName { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
[Comment("สถานะคำขอ")]
|
[Comment("สถานะคำขอ")]
|
||||||
|
|
|
||||||
|
|
@ -47,49 +47,47 @@ namespace BMA.EHR.Domain.Models.Placement
|
||||||
public string? lastName { get; set; }
|
public string? lastName { get; set; }
|
||||||
[Comment("เลขบัตรประชาชน")]
|
[Comment("เลขบัตรประชาชน")]
|
||||||
public string? citizenId { get; set; }
|
public string? citizenId { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน root")]
|
[Comment("ชื่อหน่วยงาน root old")]
|
||||||
public string? root { get; set; }
|
public string? rootOld { get; set; }
|
||||||
[Comment("id หน่วยงาน root")]
|
[Comment("id หน่วยงาน root old")]
|
||||||
public string? rootId { get; set; }
|
public string? rootOldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน root")]
|
[Comment("ชื่อย่อหน่วยงาน root old")]
|
||||||
public string? rootShortName { get; set; }
|
public string? rootShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child1")]
|
[Comment("ชื่อหน่วยงาน child1 old")]
|
||||||
public string? child1 { get; set; }
|
public string? child1Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child1")]
|
[Comment("id หน่วยงาน child1 old")]
|
||||||
public string? child1Id { get; set; }
|
public string? child1OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child1")]
|
[Comment("ชื่อย่อหน่วยงาน child1 old")]
|
||||||
public string? child1ShortName { get; set; }
|
public string? child1ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child2")]
|
[Comment("ชื่อหน่วยงาน child2 old")]
|
||||||
public string? child2 { get; set; }
|
public string? child2Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child2")]
|
[Comment("id หน่วยงาน child2 old")]
|
||||||
public string? child2Id { get; set; }
|
public string? child2OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child2")]
|
[Comment("ชื่อย่อหน่วยงาน child2 old")]
|
||||||
public string? child2ShortName { get; set; }
|
public string? child2ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child3")]
|
[Comment("ชื่อหน่วยงาน child3 old")]
|
||||||
public string? child3 { get; set; }
|
public string? child3Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child3")]
|
[Comment("id หน่วยงาน child3 old")]
|
||||||
public string? child3Id { get; set; }
|
public string? child3OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child3")]
|
[Comment("ชื่อย่อหน่วยงาน child3 old")]
|
||||||
public string? child3ShortName { get; set; }
|
public string? child3ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child4")]
|
[Comment("ชื่อหน่วยงาน child4 old")]
|
||||||
public string? child4 { get; set; }
|
public string? child4Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child4")]
|
[Comment("id หน่วยงาน child4 old")]
|
||||||
public string? child4Id { get; set; }
|
public string? child4OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child4")]
|
[Comment("ชื่อย่อหน่วยงาน child4 old")]
|
||||||
public string? child4ShortName { get; set; }
|
public string? child4ShortNameOld { get; set; }
|
||||||
// [Comment("id revision")]
|
[Comment("เลขที่ตำแหน่ง old")]
|
||||||
// public string? orgRevisionId { get; set; }
|
public int? posMasterNoOld { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
// [Comment("ชื่อตำแหน่งในสายงาน old")]
|
||||||
public int? posMasterNo { get; set; }
|
// public string? positionOld { get; set; }
|
||||||
[Comment("ชื่อตำแหน่งในสายงาน")]
|
[Comment("id ประเภทตำแหน่ง old")]
|
||||||
public string? position { get; set; }
|
public string? posTypeOldId { get; set; }
|
||||||
[Comment("id ประเภทตำแหน่ง")]
|
[Comment("ชื่อประเภทตำแหน่ง old")]
|
||||||
public string? posTypeId { get; set; }
|
public string? posTypeNameOld { get; set; }
|
||||||
[Comment("ชื่อประเภทตำแหน่ง")]
|
[Comment("id ระดับตำแหน่ง old")]
|
||||||
public string? posTypeName { get; set; }
|
public string? posLevelOldId { get; set; }
|
||||||
[Comment("id ระดับตำแหน่ง")]
|
[Comment("ชื่อระดับตำแหน่ง old")]
|
||||||
public string? posLevelId { get; set; }
|
public string? posLevelNameOld { get; set; }
|
||||||
[Comment("ชื่อระดับตำแหน่ง")]
|
|
||||||
public string? posLevelName { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,50 +44,48 @@ namespace BMA.EHR.Domain.Models.Placement
|
||||||
public string? lastName { get; set; }
|
public string? lastName { get; set; }
|
||||||
[Comment("เลขบัตรประชาชน")]
|
[Comment("เลขบัตรประชาชน")]
|
||||||
public string? citizenId { get; set; }
|
public string? citizenId { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน root")]
|
[Comment("ชื่อหน่วยงาน root old")]
|
||||||
public string? root { get; set; }
|
public string? rootOld { get; set; }
|
||||||
[Comment("id หน่วยงาน root")]
|
[Comment("id หน่วยงาน root old")]
|
||||||
public string? rootId { get; set; }
|
public string? rootOldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน root")]
|
[Comment("ชื่อย่อหน่วยงาน root old")]
|
||||||
public string? rootShortName { get; set; }
|
public string? rootShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child1")]
|
[Comment("ชื่อหน่วยงาน child1 old")]
|
||||||
public string? child1 { get; set; }
|
public string? child1Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child1")]
|
[Comment("id หน่วยงาน child1 old")]
|
||||||
public string? child1Id { get; set; }
|
public string? child1OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child1")]
|
[Comment("ชื่อย่อหน่วยงาน child1 old")]
|
||||||
public string? child1ShortName { get; set; }
|
public string? child1ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child2")]
|
[Comment("ชื่อหน่วยงาน child2 old")]
|
||||||
public string? child2 { get; set; }
|
public string? child2Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child2")]
|
[Comment("id หน่วยงาน child2 old")]
|
||||||
public string? child2Id { get; set; }
|
public string? child2OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child2")]
|
[Comment("ชื่อย่อหน่วยงาน child2 old")]
|
||||||
public string? child2ShortName { get; set; }
|
public string? child2ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child3")]
|
[Comment("ชื่อหน่วยงาน child3 old")]
|
||||||
public string? child3 { get; set; }
|
public string? child3Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child3")]
|
[Comment("id หน่วยงาน child3 old")]
|
||||||
public string? child3Id { get; set; }
|
public string? child3OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child3")]
|
[Comment("ชื่อย่อหน่วยงาน child3 old")]
|
||||||
public string? child3ShortName { get; set; }
|
public string? child3ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child4")]
|
[Comment("ชื่อหน่วยงาน child4 old")]
|
||||||
public string? child4 { get; set; }
|
public string? child4Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child4")]
|
[Comment("id หน่วยงาน child4 old")]
|
||||||
public string? child4Id { get; set; }
|
public string? child4OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child4")]
|
[Comment("ชื่อย่อหน่วยงาน child4 old")]
|
||||||
public string? child4ShortName { get; set; }
|
public string? child4ShortNameOld { get; set; }
|
||||||
// [Comment("id revision")]
|
[Comment("เลขที่ตำแหน่ง old")]
|
||||||
// public string? orgRevisionId { get; set; }
|
public int? posMasterNoOld { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
// [Comment("ชื่อตำแหน่งในสายงาน old")]
|
||||||
public int? posMasterNo { get; set; }
|
// public string? positionOld { get; set; }
|
||||||
[Comment("ชื่อตำแหน่งในสายงาน")]
|
[Comment("id ประเภทตำแหน่ง old")]
|
||||||
public string? position { get; set; }
|
public string? posTypeOldId { get; set; }
|
||||||
[Comment("id ประเภทตำแหน่ง")]
|
[Comment("ชื่อประเภทตำแหน่ง old")]
|
||||||
public string? posTypeId { get; set; }
|
public string? posTypeNameOld { get; set; }
|
||||||
[Comment("ชื่อประเภทตำแหน่ง")]
|
[Comment("id ระดับตำแหน่ง old")]
|
||||||
public string? posTypeName { get; set; }
|
public string? posLevelOldId { get; set; }
|
||||||
[Comment("id ระดับตำแหน่ง")]
|
[Comment("ชื่อระดับตำแหน่ง old")]
|
||||||
public string? posLevelId { get; set; }
|
public string? posLevelNameOld { get; set; }
|
||||||
[Comment("ชื่อระดับตำแหน่ง")]
|
|
||||||
public string? posLevelName { get; set; }
|
|
||||||
public virtual List<PlacementTransferDoc> PlacementTransferDocs { get; set; } = new List<PlacementTransferDoc>();
|
public virtual List<PlacementTransferDoc> PlacementTransferDocs { get; set; } = new List<PlacementTransferDoc>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,50 +55,48 @@ namespace BMA.EHR.Domain.Models.Retirement
|
||||||
public string? lastName { get; set; }
|
public string? lastName { get; set; }
|
||||||
[Comment("เลขบัตรประชาชน")]
|
[Comment("เลขบัตรประชาชน")]
|
||||||
public string? citizenId { get; set; }
|
public string? citizenId { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน root")]
|
[Comment("ชื่อหน่วยงาน root old")]
|
||||||
public string? root { get; set; }
|
public string? rootOld { get; set; }
|
||||||
[Comment("id หน่วยงาน root")]
|
[Comment("id หน่วยงาน root old")]
|
||||||
public string? rootId { get; set; }
|
public string? rootOldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน root")]
|
[Comment("ชื่อย่อหน่วยงาน root old")]
|
||||||
public string? rootShortName { get; set; }
|
public string? rootShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child1")]
|
[Comment("ชื่อหน่วยงาน child1 old")]
|
||||||
public string? child1 { get; set; }
|
public string? child1Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child1")]
|
[Comment("id หน่วยงาน child1 old")]
|
||||||
public string? child1Id { get; set; }
|
public string? child1OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child1")]
|
[Comment("ชื่อย่อหน่วยงาน child1 old")]
|
||||||
public string? child1ShortName { get; set; }
|
public string? child1ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child2")]
|
[Comment("ชื่อหน่วยงาน child2 old")]
|
||||||
public string? child2 { get; set; }
|
public string? child2Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child2")]
|
[Comment("id หน่วยงาน child2 old")]
|
||||||
public string? child2Id { get; set; }
|
public string? child2OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child2")]
|
[Comment("ชื่อย่อหน่วยงาน child2 old")]
|
||||||
public string? child2ShortName { get; set; }
|
public string? child2ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child3")]
|
[Comment("ชื่อหน่วยงาน child3 old")]
|
||||||
public string? child3 { get; set; }
|
public string? child3Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child3")]
|
[Comment("id หน่วยงาน child3 old")]
|
||||||
public string? child3Id { get; set; }
|
public string? child3OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child3")]
|
[Comment("ชื่อย่อหน่วยงาน child3 old")]
|
||||||
public string? child3ShortName { get; set; }
|
public string? child3ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child4")]
|
[Comment("ชื่อหน่วยงาน child4 old")]
|
||||||
public string? child4 { get; set; }
|
public string? child4Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child4")]
|
[Comment("id หน่วยงาน child4 old")]
|
||||||
public string? child4Id { get; set; }
|
public string? child4OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child4")]
|
[Comment("ชื่อย่อหน่วยงาน child4 old")]
|
||||||
public string? child4ShortName { get; set; }
|
public string? child4ShortNameOld { get; set; }
|
||||||
// [Comment("id revision")]
|
[Comment("เลขที่ตำแหน่ง old")]
|
||||||
// public string? orgRevisionId { get; set; }
|
public int? posMasterNoOld { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
// [Comment("ชื่อตำแหน่งในสายงาน old")]
|
||||||
public int? posMasterNo { get; set; }
|
// public string? positionOld { get; set; }
|
||||||
[Comment("ชื่อตำแหน่งในสายงาน")]
|
[Comment("id ประเภทตำแหน่ง old")]
|
||||||
public string? position { get; set; }
|
public string? posTypeOldId { get; set; }
|
||||||
[Comment("id ประเภทตำแหน่ง")]
|
[Comment("ชื่อประเภทตำแหน่ง old")]
|
||||||
public string? posTypeId { get; set; }
|
public string? posTypeNameOld { get; set; }
|
||||||
[Comment("ชื่อประเภทตำแหน่ง")]
|
[Comment("id ระดับตำแหน่ง old")]
|
||||||
public string? posTypeName { get; set; }
|
public string? posLevelOldId { get; set; }
|
||||||
[Comment("id ระดับตำแหน่ง")]
|
[Comment("ชื่อระดับตำแหน่ง old")]
|
||||||
public string? posLevelId { get; set; }
|
public string? posLevelNameOld { get; set; }
|
||||||
[Comment("ชื่อระดับตำแหน่ง")]
|
|
||||||
public string? posLevelName { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
public virtual List<RetirementOtherDoc> RetirementOtherDocs { get; set; } = new List<RetirementOtherDoc>();
|
public virtual List<RetirementOtherDoc> RetirementOtherDocs { get; set; } = new List<RetirementOtherDoc>();
|
||||||
|
|
|
||||||
|
|
@ -43,50 +43,48 @@ namespace BMA.EHR.Domain.Models.Retirement
|
||||||
public string? lastName { get; set; }
|
public string? lastName { get; set; }
|
||||||
[Comment("เลขบัตรประชาชน")]
|
[Comment("เลขบัตรประชาชน")]
|
||||||
public string? citizenId { get; set; }
|
public string? citizenId { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน root")]
|
[Comment("ชื่อหน่วยงาน root old")]
|
||||||
public string? root { get; set; }
|
public string? rootOld { get; set; }
|
||||||
[Comment("id หน่วยงาน root")]
|
[Comment("id หน่วยงาน root old")]
|
||||||
public string? rootId { get; set; }
|
public string? rootOldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน root")]
|
[Comment("ชื่อย่อหน่วยงาน root old")]
|
||||||
public string? rootShortName { get; set; }
|
public string? rootShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child1")]
|
[Comment("ชื่อหน่วยงาน child1 old")]
|
||||||
public string? child1 { get; set; }
|
public string? child1Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child1")]
|
[Comment("id หน่วยงาน child1 old")]
|
||||||
public string? child1Id { get; set; }
|
public string? child1OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child1")]
|
[Comment("ชื่อย่อหน่วยงาน child1 old")]
|
||||||
public string? child1ShortName { get; set; }
|
public string? child1ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child2")]
|
[Comment("ชื่อหน่วยงาน child2 old")]
|
||||||
public string? child2 { get; set; }
|
public string? child2Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child2")]
|
[Comment("id หน่วยงาน child2 old")]
|
||||||
public string? child2Id { get; set; }
|
public string? child2OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child2")]
|
[Comment("ชื่อย่อหน่วยงาน child2 old")]
|
||||||
public string? child2ShortName { get; set; }
|
public string? child2ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child3")]
|
[Comment("ชื่อหน่วยงาน child3 old")]
|
||||||
public string? child3 { get; set; }
|
public string? child3Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child3")]
|
[Comment("id หน่วยงาน child3 old")]
|
||||||
public string? child3Id { get; set; }
|
public string? child3OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child3")]
|
[Comment("ชื่อย่อหน่วยงาน child3 old")]
|
||||||
public string? child3ShortName { get; set; }
|
public string? child3ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child4")]
|
[Comment("ชื่อหน่วยงาน child4 old")]
|
||||||
public string? child4 { get; set; }
|
public string? child4Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child4")]
|
[Comment("id หน่วยงาน child4 old")]
|
||||||
public string? child4Id { get; set; }
|
public string? child4OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child4")]
|
[Comment("ชื่อย่อหน่วยงาน child4 old")]
|
||||||
public string? child4ShortName { get; set; }
|
public string? child4ShortNameOld { get; set; }
|
||||||
// [Comment("id revision")]
|
[Comment("เลขที่ตำแหน่ง old")]
|
||||||
// public string? orgRevisionId { get; set; }
|
public int? posMasterNoOld { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
// [Comment("ชื่อตำแหน่งในสายงาน old")]
|
||||||
public int? posMasterNo { get; set; }
|
// public string? positionOld { get; set; }
|
||||||
[Comment("ชื่อตำแหน่งในสายงาน")]
|
[Comment("id ประเภทตำแหน่ง old")]
|
||||||
public string? position { get; set; }
|
public string? posTypeOldId { get; set; }
|
||||||
[Comment("id ประเภทตำแหน่ง")]
|
[Comment("ชื่อประเภทตำแหน่ง old")]
|
||||||
public string? posTypeId { get; set; }
|
public string? posTypeNameOld { get; set; }
|
||||||
[Comment("ชื่อประเภทตำแหน่ง")]
|
[Comment("id ระดับตำแหน่ง old")]
|
||||||
public string? posTypeName { get; set; }
|
public string? posLevelOldId { get; set; }
|
||||||
[Comment("id ระดับตำแหน่ง")]
|
[Comment("ชื่อระดับตำแหน่ง old")]
|
||||||
public string? posLevelId { get; set; }
|
public string? posLevelNameOld { get; set; }
|
||||||
[Comment("ชื่อระดับตำแหน่ง")]
|
|
||||||
public string? posLevelName { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
[Comment("สถานะการใช้งาน")]
|
[Comment("สถานะการใช้งาน")]
|
||||||
|
|
|
||||||
|
|
@ -86,50 +86,48 @@ namespace BMA.EHR.Domain.Models.Retirement
|
||||||
public string? lastName { get; set; }
|
public string? lastName { get; set; }
|
||||||
[Comment("เลขบัตรประชาชน")]
|
[Comment("เลขบัตรประชาชน")]
|
||||||
public string? citizenId { get; set; }
|
public string? citizenId { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน root")]
|
[Comment("ชื่อหน่วยงาน root old")]
|
||||||
public string? root { get; set; }
|
public string? rootOld { get; set; }
|
||||||
[Comment("id หน่วยงาน root")]
|
[Comment("id หน่วยงาน root old")]
|
||||||
public string? rootId { get; set; }
|
public string? rootOldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน root")]
|
[Comment("ชื่อย่อหน่วยงาน root old")]
|
||||||
public string? rootShortName { get; set; }
|
public string? rootShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child1")]
|
[Comment("ชื่อหน่วยงาน child1 old")]
|
||||||
public string? child1 { get; set; }
|
public string? child1Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child1")]
|
[Comment("id หน่วยงาน child1 old")]
|
||||||
public string? child1Id { get; set; }
|
public string? child1OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child1")]
|
[Comment("ชื่อย่อหน่วยงาน child1 old")]
|
||||||
public string? child1ShortName { get; set; }
|
public string? child1ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child2")]
|
[Comment("ชื่อหน่วยงาน child2 old")]
|
||||||
public string? child2 { get; set; }
|
public string? child2Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child2")]
|
[Comment("id หน่วยงาน child2 old")]
|
||||||
public string? child2Id { get; set; }
|
public string? child2OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child2")]
|
[Comment("ชื่อย่อหน่วยงาน child2 old")]
|
||||||
public string? child2ShortName { get; set; }
|
public string? child2ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child3")]
|
[Comment("ชื่อหน่วยงาน child3 old")]
|
||||||
public string? child3 { get; set; }
|
public string? child3Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child3")]
|
[Comment("id หน่วยงาน child3 old")]
|
||||||
public string? child3Id { get; set; }
|
public string? child3OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child3")]
|
[Comment("ชื่อย่อหน่วยงาน child3 old")]
|
||||||
public string? child3ShortName { get; set; }
|
public string? child3ShortNameOld { get; set; }
|
||||||
[Comment("ชื่อหน่วยงาน child4")]
|
[Comment("ชื่อหน่วยงาน child4 old")]
|
||||||
public string? child4 { get; set; }
|
public string? child4Old { get; set; }
|
||||||
[Comment("id หน่วยงาน child4")]
|
[Comment("id หน่วยงาน child4 old")]
|
||||||
public string? child4Id { get; set; }
|
public string? child4OldId { get; set; }
|
||||||
[Comment("ชื่อย่อหน่วยงาน child4")]
|
[Comment("ชื่อย่อหน่วยงาน child4 old")]
|
||||||
public string? child4ShortName { get; set; }
|
public string? child4ShortNameOld { get; set; }
|
||||||
// [Comment("id revision")]
|
[Comment("เลขที่ตำแหน่ง old")]
|
||||||
// public string? orgRevisionId { get; set; }
|
public int? posMasterNoOld { get; set; }
|
||||||
[Comment("เลขที่ตำแหน่ง")]
|
// [Comment("ชื่อตำแหน่งในสายงาน old")]
|
||||||
public int? posMasterNo { get; set; }
|
// public string? positionOld { get; set; }
|
||||||
[Comment("ชื่อตำแหน่งในสายงาน")]
|
[Comment("id ประเภทตำแหน่ง old")]
|
||||||
public string? position { get; set; }
|
public string? posTypeOldId { get; set; }
|
||||||
[Comment("id ประเภทตำแหน่ง")]
|
[Comment("ชื่อประเภทตำแหน่ง old")]
|
||||||
public string? posTypeId { get; set; }
|
public string? posTypeNameOld { get; set; }
|
||||||
[Comment("ชื่อประเภทตำแหน่ง")]
|
[Comment("id ระดับตำแหน่ง old")]
|
||||||
public string? posTypeName { get; set; }
|
public string? posLevelOldId { get; set; }
|
||||||
[Comment("id ระดับตำแหน่ง")]
|
[Comment("ชื่อระดับตำแหน่ง old")]
|
||||||
public string? posLevelId { get; set; }
|
public string? posLevelNameOld { get; set; }
|
||||||
[Comment("ชื่อระดับตำแหน่ง")]
|
|
||||||
public string? posLevelName { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
public virtual List<RetirementResignDoc> RetirementResignDocs { get; set; } = new List<RetirementResignDoc>();
|
public virtual List<RetirementResignDoc> RetirementResignDocs { get; set; } = new List<RetirementResignDoc>();
|
||||||
|
|
|
||||||
17825
BMA.EHR.Infrastructure/Migrations/20240523153649_update table discipline add child1.Designer.cs
generated
Normal file
17825
BMA.EHR.Infrastructure/Migrations/20240523153649_update table discipline add child1.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,22 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace BMA.EHR.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class updatetabledisciplineaddchild1 : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
17801
BMA.EHR.Infrastructure/Migrations/20240523171746_update table discipline add child2.Designer.cs
generated
Normal file
17801
BMA.EHR.Infrastructure/Migrations/20240523171746_update table discipline add child2.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -11837,53 +11837,53 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("สถานะคำขอ");
|
.HasComment("สถานะคำขอ");
|
||||||
|
|
||||||
b.Property<string>("child1")
|
b.Property<string>("child1Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child1");
|
.HasComment("ชื่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1Id")
|
b.Property<string>("child1OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child1");
|
.HasComment("id หน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1ShortName")
|
b.Property<string>("child1ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child1");
|
.HasComment("ชื่อย่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child2")
|
b.Property<string>("child2Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child2");
|
.HasComment("ชื่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2Id")
|
b.Property<string>("child2OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child2");
|
.HasComment("id หน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2ShortName")
|
b.Property<string>("child2ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child2");
|
.HasComment("ชื่อย่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child3")
|
b.Property<string>("child3Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child3");
|
.HasComment("ชื่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3Id")
|
b.Property<string>("child3OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child3");
|
.HasComment("id หน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3ShortName")
|
b.Property<string>("child3ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child3");
|
.HasComment("ชื่อย่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child4")
|
b.Property<string>("child4Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child4");
|
.HasComment("ชื่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4Id")
|
b.Property<string>("child4OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child4");
|
.HasComment("id หน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4ShortName")
|
b.Property<string>("child4ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child4");
|
.HasComment("ชื่อย่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("citizenId")
|
b.Property<string>("citizenId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -11897,29 +11897,25 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("นามสกุล");
|
.HasComment("นามสกุล");
|
||||||
|
|
||||||
b.Property<string>("posLevelId")
|
b.Property<string>("posLevelNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ระดับตำแหน่ง");
|
.HasComment("ชื่อระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posLevelName")
|
b.Property<string>("posLevelOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อระดับตำแหน่ง");
|
.HasComment("id ระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<int?>("posMasterNo")
|
b.Property<int?>("posMasterNoOld")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("เลขที่ตำแหน่ง");
|
.HasComment("เลขที่ตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeId")
|
b.Property<string>("posTypeNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ประเภทตำแหน่ง");
|
.HasComment("ชื่อประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeName")
|
b.Property<string>("posTypeOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อประเภทตำแหน่ง");
|
.HasComment("id ประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("position")
|
|
||||||
.HasColumnType("longtext")
|
|
||||||
.HasComment("ชื่อตำแหน่งในสายงาน");
|
|
||||||
|
|
||||||
b.Property<string>("prefix")
|
b.Property<string>("prefix")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -11929,17 +11925,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("profile Id");
|
.HasComment("profile Id");
|
||||||
|
|
||||||
b.Property<string>("root")
|
b.Property<string>("rootOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน root");
|
.HasComment("ชื่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootId")
|
b.Property<string>("rootOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน root");
|
.HasComment("id หน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootShortName")
|
b.Property<string>("rootShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน root");
|
.HasComment("ชื่อย่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
@ -13350,53 +13346,53 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("สถานะคำขอ");
|
.HasComment("สถานะคำขอ");
|
||||||
|
|
||||||
b.Property<string>("child1")
|
b.Property<string>("child1Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child1");
|
.HasComment("ชื่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1Id")
|
b.Property<string>("child1OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child1");
|
.HasComment("id หน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1ShortName")
|
b.Property<string>("child1ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child1");
|
.HasComment("ชื่อย่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child2")
|
b.Property<string>("child2Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child2");
|
.HasComment("ชื่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2Id")
|
b.Property<string>("child2OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child2");
|
.HasComment("id หน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2ShortName")
|
b.Property<string>("child2ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child2");
|
.HasComment("ชื่อย่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child3")
|
b.Property<string>("child3Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child3");
|
.HasComment("ชื่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3Id")
|
b.Property<string>("child3OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child3");
|
.HasComment("id หน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3ShortName")
|
b.Property<string>("child3ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child3");
|
.HasComment("ชื่อย่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child4")
|
b.Property<string>("child4Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child4");
|
.HasComment("ชื่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4Id")
|
b.Property<string>("child4OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child4");
|
.HasComment("id หน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4ShortName")
|
b.Property<string>("child4ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child4");
|
.HasComment("ชื่อย่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("citizenId")
|
b.Property<string>("citizenId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -13410,29 +13406,25 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("นามสกุล");
|
.HasComment("นามสกุล");
|
||||||
|
|
||||||
b.Property<string>("posLevelId")
|
b.Property<string>("posLevelNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ระดับตำแหน่ง");
|
.HasComment("ชื่อระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posLevelName")
|
b.Property<string>("posLevelOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อระดับตำแหน่ง");
|
.HasComment("id ระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<int?>("posMasterNo")
|
b.Property<int?>("posMasterNoOld")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("เลขที่ตำแหน่ง");
|
.HasComment("เลขที่ตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeId")
|
b.Property<string>("posTypeNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ประเภทตำแหน่ง");
|
.HasComment("ชื่อประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeName")
|
b.Property<string>("posTypeOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อประเภทตำแหน่ง");
|
.HasComment("id ประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("position")
|
|
||||||
.HasColumnType("longtext")
|
|
||||||
.HasComment("ชื่อตำแหน่งในสายงาน");
|
|
||||||
|
|
||||||
b.Property<string>("prefix")
|
b.Property<string>("prefix")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -13442,17 +13434,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("profile Id");
|
.HasComment("profile Id");
|
||||||
|
|
||||||
b.Property<string>("root")
|
b.Property<string>("rootOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน root");
|
.HasComment("ชื่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootId")
|
b.Property<string>("rootOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน root");
|
.HasComment("id หน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootShortName")
|
b.Property<string>("rootShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน root");
|
.HasComment("ชื่อย่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
@ -13555,53 +13547,53 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("สถานะคำขอ");
|
.HasComment("สถานะคำขอ");
|
||||||
|
|
||||||
b.Property<string>("child1")
|
b.Property<string>("child1Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child1");
|
.HasComment("ชื่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1Id")
|
b.Property<string>("child1OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child1");
|
.HasComment("id หน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1ShortName")
|
b.Property<string>("child1ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child1");
|
.HasComment("ชื่อย่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child2")
|
b.Property<string>("child2Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child2");
|
.HasComment("ชื่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2Id")
|
b.Property<string>("child2OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child2");
|
.HasComment("id หน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2ShortName")
|
b.Property<string>("child2ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child2");
|
.HasComment("ชื่อย่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child3")
|
b.Property<string>("child3Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child3");
|
.HasComment("ชื่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3Id")
|
b.Property<string>("child3OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child3");
|
.HasComment("id หน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3ShortName")
|
b.Property<string>("child3ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child3");
|
.HasComment("ชื่อย่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child4")
|
b.Property<string>("child4Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child4");
|
.HasComment("ชื่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4Id")
|
b.Property<string>("child4OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child4");
|
.HasComment("id หน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4ShortName")
|
b.Property<string>("child4ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child4");
|
.HasComment("ชื่อย่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("citizenId")
|
b.Property<string>("citizenId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -13615,29 +13607,25 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("นามสกุล");
|
.HasComment("นามสกุล");
|
||||||
|
|
||||||
b.Property<string>("posLevelId")
|
b.Property<string>("posLevelNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ระดับตำแหน่ง");
|
.HasComment("ชื่อระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posLevelName")
|
b.Property<string>("posLevelOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อระดับตำแหน่ง");
|
.HasComment("id ระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<int?>("posMasterNo")
|
b.Property<int?>("posMasterNoOld")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("เลขที่ตำแหน่ง");
|
.HasComment("เลขที่ตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeId")
|
b.Property<string>("posTypeNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ประเภทตำแหน่ง");
|
.HasComment("ชื่อประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeName")
|
b.Property<string>("posTypeOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อประเภทตำแหน่ง");
|
.HasComment("id ประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("position")
|
|
||||||
.HasColumnType("longtext")
|
|
||||||
.HasComment("ชื่อตำแหน่งในสายงาน");
|
|
||||||
|
|
||||||
b.Property<string>("prefix")
|
b.Property<string>("prefix")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -13647,17 +13635,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("profile Id");
|
.HasComment("profile Id");
|
||||||
|
|
||||||
b.Property<string>("root")
|
b.Property<string>("rootOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน root");
|
.HasComment("ชื่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootId")
|
b.Property<string>("rootOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน root");
|
.HasComment("id หน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootShortName")
|
b.Property<string>("rootShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน root");
|
.HasComment("ชื่อย่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
@ -14480,53 +14468,53 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("สถานะคำขอ");
|
.HasComment("สถานะคำขอ");
|
||||||
|
|
||||||
b.Property<string>("child1")
|
b.Property<string>("child1Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child1");
|
.HasComment("ชื่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1Id")
|
b.Property<string>("child1OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child1");
|
.HasComment("id หน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1ShortName")
|
b.Property<string>("child1ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child1");
|
.HasComment("ชื่อย่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child2")
|
b.Property<string>("child2Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child2");
|
.HasComment("ชื่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2Id")
|
b.Property<string>("child2OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child2");
|
.HasComment("id หน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2ShortName")
|
b.Property<string>("child2ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child2");
|
.HasComment("ชื่อย่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child3")
|
b.Property<string>("child3Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child3");
|
.HasComment("ชื่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3Id")
|
b.Property<string>("child3OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child3");
|
.HasComment("id หน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3ShortName")
|
b.Property<string>("child3ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child3");
|
.HasComment("ชื่อย่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child4")
|
b.Property<string>("child4Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child4");
|
.HasComment("ชื่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4Id")
|
b.Property<string>("child4OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child4");
|
.HasComment("id หน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4ShortName")
|
b.Property<string>("child4ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child4");
|
.HasComment("ชื่อย่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("citizenId")
|
b.Property<string>("citizenId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -14540,29 +14528,25 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("นามสกุล");
|
.HasComment("นามสกุล");
|
||||||
|
|
||||||
b.Property<string>("posLevelId")
|
b.Property<string>("posLevelNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ระดับตำแหน่ง");
|
.HasComment("ชื่อระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posLevelName")
|
b.Property<string>("posLevelOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อระดับตำแหน่ง");
|
.HasComment("id ระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<int?>("posMasterNo")
|
b.Property<int?>("posMasterNoOld")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("เลขที่ตำแหน่ง");
|
.HasComment("เลขที่ตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeId")
|
b.Property<string>("posTypeNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ประเภทตำแหน่ง");
|
.HasComment("ชื่อประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeName")
|
b.Property<string>("posTypeOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อประเภทตำแหน่ง");
|
.HasComment("id ประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("position")
|
|
||||||
.HasColumnType("longtext")
|
|
||||||
.HasComment("ชื่อตำแหน่งในสายงาน");
|
|
||||||
|
|
||||||
b.Property<string>("prefix")
|
b.Property<string>("prefix")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -14572,17 +14556,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("profile Id");
|
.HasComment("profile Id");
|
||||||
|
|
||||||
b.Property<string>("root")
|
b.Property<string>("rootOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน root");
|
.HasComment("ชื่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootId")
|
b.Property<string>("rootOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน root");
|
.HasComment("id หน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootShortName")
|
b.Property<string>("rootShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน root");
|
.HasComment("ชื่อย่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
@ -14749,53 +14733,53 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("สถานะคำขอ");
|
.HasComment("สถานะคำขอ");
|
||||||
|
|
||||||
b.Property<string>("child1")
|
b.Property<string>("child1Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child1");
|
.HasComment("ชื่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1Id")
|
b.Property<string>("child1OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child1");
|
.HasComment("id หน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1ShortName")
|
b.Property<string>("child1ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child1");
|
.HasComment("ชื่อย่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child2")
|
b.Property<string>("child2Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child2");
|
.HasComment("ชื่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2Id")
|
b.Property<string>("child2OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child2");
|
.HasComment("id หน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2ShortName")
|
b.Property<string>("child2ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child2");
|
.HasComment("ชื่อย่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child3")
|
b.Property<string>("child3Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child3");
|
.HasComment("ชื่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3Id")
|
b.Property<string>("child3OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child3");
|
.HasComment("id หน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3ShortName")
|
b.Property<string>("child3ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child3");
|
.HasComment("ชื่อย่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child4")
|
b.Property<string>("child4Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child4");
|
.HasComment("ชื่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4Id")
|
b.Property<string>("child4OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child4");
|
.HasComment("id หน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4ShortName")
|
b.Property<string>("child4ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child4");
|
.HasComment("ชื่อย่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("citizenId")
|
b.Property<string>("citizenId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -14809,29 +14793,25 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("นามสกุล");
|
.HasComment("นามสกุล");
|
||||||
|
|
||||||
b.Property<string>("posLevelId")
|
b.Property<string>("posLevelNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ระดับตำแหน่ง");
|
.HasComment("ชื่อระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posLevelName")
|
b.Property<string>("posLevelOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อระดับตำแหน่ง");
|
.HasComment("id ระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<int?>("posMasterNo")
|
b.Property<int?>("posMasterNoOld")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("เลขที่ตำแหน่ง");
|
.HasComment("เลขที่ตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeId")
|
b.Property<string>("posTypeNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ประเภทตำแหน่ง");
|
.HasComment("ชื่อประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeName")
|
b.Property<string>("posTypeOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อประเภทตำแหน่ง");
|
.HasComment("id ประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("position")
|
|
||||||
.HasColumnType("longtext")
|
|
||||||
.HasComment("ชื่อตำแหน่งในสายงาน");
|
|
||||||
|
|
||||||
b.Property<string>("prefix")
|
b.Property<string>("prefix")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -14841,17 +14821,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("profile Id");
|
.HasComment("profile Id");
|
||||||
|
|
||||||
b.Property<string>("root")
|
b.Property<string>("rootOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน root");
|
.HasComment("ชื่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootId")
|
b.Property<string>("rootOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน root");
|
.HasComment("id หน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootShortName")
|
b.Property<string>("rootShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน root");
|
.HasComment("ชื่อย่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
@ -15626,53 +15606,53 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("สถานะลาออก");
|
.HasComment("สถานะลาออก");
|
||||||
|
|
||||||
b.Property<string>("child1")
|
b.Property<string>("child1Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child1");
|
.HasComment("ชื่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1Id")
|
b.Property<string>("child1OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child1");
|
.HasComment("id หน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child1ShortName")
|
b.Property<string>("child1ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child1");
|
.HasComment("ชื่อย่อหน่วยงาน child1 old");
|
||||||
|
|
||||||
b.Property<string>("child2")
|
b.Property<string>("child2Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child2");
|
.HasComment("ชื่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2Id")
|
b.Property<string>("child2OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child2");
|
.HasComment("id หน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child2ShortName")
|
b.Property<string>("child2ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child2");
|
.HasComment("ชื่อย่อหน่วยงาน child2 old");
|
||||||
|
|
||||||
b.Property<string>("child3")
|
b.Property<string>("child3Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child3");
|
.HasComment("ชื่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3Id")
|
b.Property<string>("child3OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child3");
|
.HasComment("id หน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child3ShortName")
|
b.Property<string>("child3ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child3");
|
.HasComment("ชื่อย่อหน่วยงาน child3 old");
|
||||||
|
|
||||||
b.Property<string>("child4")
|
b.Property<string>("child4Old")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน child4");
|
.HasComment("ชื่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4Id")
|
b.Property<string>("child4OldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน child4");
|
.HasComment("id หน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("child4ShortName")
|
b.Property<string>("child4ShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน child4");
|
.HasComment("ชื่อย่อหน่วยงาน child4 old");
|
||||||
|
|
||||||
b.Property<string>("citizenId")
|
b.Property<string>("citizenId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -15686,29 +15666,25 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("นามสกุล");
|
.HasComment("นามสกุล");
|
||||||
|
|
||||||
b.Property<string>("posLevelId")
|
b.Property<string>("posLevelNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ระดับตำแหน่ง");
|
.HasComment("ชื่อระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posLevelName")
|
b.Property<string>("posLevelOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อระดับตำแหน่ง");
|
.HasComment("id ระดับตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<int?>("posMasterNo")
|
b.Property<int?>("posMasterNoOld")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("เลขที่ตำแหน่ง");
|
.HasComment("เลขที่ตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeId")
|
b.Property<string>("posTypeNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id ประเภทตำแหน่ง");
|
.HasComment("ชื่อประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("posTypeName")
|
b.Property<string>("posTypeOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อประเภทตำแหน่ง");
|
.HasComment("id ประเภทตำแหน่ง old");
|
||||||
|
|
||||||
b.Property<string>("position")
|
|
||||||
.HasColumnType("longtext")
|
|
||||||
.HasComment("ชื่อตำแหน่งในสายงาน");
|
|
||||||
|
|
||||||
b.Property<string>("prefix")
|
b.Property<string>("prefix")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
|
|
@ -15718,17 +15694,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("profile Id");
|
.HasComment("profile Id");
|
||||||
|
|
||||||
b.Property<string>("root")
|
b.Property<string>("rootOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อหน่วยงาน root");
|
.HasComment("ชื่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootId")
|
b.Property<string>("rootOldId")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("id หน่วยงาน root");
|
.HasComment("id หน่วยงาน root old");
|
||||||
|
|
||||||
b.Property<string>("rootShortName")
|
b.Property<string>("rootShortNameOld")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("longtext")
|
||||||
.HasComment("ชื่อย่อหน่วยงาน root");
|
.HasComment("ชื่อย่อหน่วยงาน root old");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -612,21 +612,21 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
.FirstOrDefaultAsync(x => x.Id == id);
|
.FirstOrDefaultAsync(x => x.Id == id);
|
||||||
if (deleted == null)
|
if (deleted == null)
|
||||||
return NotFound();
|
return NotFound();
|
||||||
// var placementAppointmentDocs = new List<dynamic>();
|
var placementAppointmentDocs = new List<dynamic>();
|
||||||
// foreach (var doc in deleted.PlacementAppointmentDocs)
|
foreach (var doc in deleted.PlacementAppointmentDocs)
|
||||||
// {
|
{
|
||||||
// if (doc.Document != null)
|
if (doc.Document != null)
|
||||||
// placementAppointmentDocs.Add(doc.Document.Id);
|
placementAppointmentDocs.Add(doc.Document.Id);
|
||||||
// }
|
}
|
||||||
_context.PlacementAppointmentDocs.RemoveRange(deleted.PlacementAppointmentDocs);
|
_context.PlacementAppointmentDocs.RemoveRange(deleted.PlacementAppointmentDocs);
|
||||||
await _context.SaveChangesAsync();
|
await _context.SaveChangesAsync();
|
||||||
// _context.PlacementAppointments.Remove(deleted);
|
_context.PlacementAppointments.Remove(deleted);
|
||||||
// foreach (var doc in placementAppointmentDocs)
|
foreach (var doc in placementAppointmentDocs)
|
||||||
// {
|
{
|
||||||
// if (doc != null)
|
if (doc != null)
|
||||||
// await _documentService.DeleteFileAsync(doc);
|
await _documentService.DeleteFileAsync(doc);
|
||||||
// }
|
}
|
||||||
// await _context.SaveChangesAsync();
|
await _context.SaveChangesAsync();
|
||||||
|
|
||||||
return Success();
|
return Success();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -598,21 +598,21 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
.FirstOrDefaultAsync(x => x.Id == id);
|
.FirstOrDefaultAsync(x => x.Id == id);
|
||||||
if (deleted == null)
|
if (deleted == null)
|
||||||
return NotFound();
|
return NotFound();
|
||||||
// var placementAppointmentDocs = new List<dynamic>();
|
var placementAppointmentDocs = new List<dynamic>();
|
||||||
// foreach (var doc in deleted.PlacementAppointmentDocs)
|
foreach (var doc in deleted.PlacementAppointmentDocs)
|
||||||
// {
|
{
|
||||||
// if (doc.Document != null)
|
if (doc.Document != null)
|
||||||
// placementAppointmentDocs.Add(doc.Document.Id);
|
placementAppointmentDocs.Add(doc.Document.Id);
|
||||||
// }
|
}
|
||||||
_context.PlacementAppointmentDocs.RemoveRange(deleted.PlacementAppointmentDocs);
|
_context.PlacementAppointmentDocs.RemoveRange(deleted.PlacementAppointmentDocs);
|
||||||
await _context.SaveChangesAsync();
|
await _context.SaveChangesAsync();
|
||||||
// _context.PlacementAppointments.Remove(deleted);
|
_context.PlacementAppointments.Remove(deleted);
|
||||||
// foreach (var doc in placementAppointmentDocs)
|
foreach (var doc in placementAppointmentDocs)
|
||||||
// {
|
{
|
||||||
// if (doc != null)
|
if (doc != null)
|
||||||
// await _documentService.DeleteFileAsync(doc);
|
await _documentService.DeleteFileAsync(doc);
|
||||||
// }
|
}
|
||||||
// await _context.SaveChangesAsync();
|
await _context.SaveChangesAsync();
|
||||||
|
|
||||||
return Success();
|
return Success();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -92,27 +92,34 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
|
|
||||||
var placementOfficers = await _context.PlacementOfficers.AsQueryable()
|
var placementOfficers = await _context.PlacementOfficers.AsQueryable()
|
||||||
.OrderByDescending(x => x.CreatedAt)
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||||
.Select(p => new
|
.Select(p => new
|
||||||
{
|
{
|
||||||
p.Id,
|
p.Id,
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.PositionOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
p.Status,
|
p.Status,
|
||||||
|
|
@ -149,20 +156,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
p.Status,
|
p.Status,
|
||||||
|
|
@ -222,27 +235,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
placementOfficer.firstName = org.result.firstName;
|
placementOfficer.firstName = org.result.firstName;
|
||||||
placementOfficer.lastName = org.result.lastName;
|
placementOfficer.lastName = org.result.lastName;
|
||||||
placementOfficer.citizenId = org.result.citizenId;
|
placementOfficer.citizenId = org.result.citizenId;
|
||||||
placementOfficer.root = org.result.root;
|
placementOfficer.rootOld = org.result.root;
|
||||||
placementOfficer.rootId = org.result.rootId;
|
placementOfficer.rootOldId = org.result.rootId;
|
||||||
placementOfficer.rootShortName = org.result.rootShortName;
|
placementOfficer.rootShortNameOld = org.result.rootShortName;
|
||||||
placementOfficer.child1 = org.result.child1;
|
placementOfficer.child1Old = org.result.child1;
|
||||||
placementOfficer.child1Id = org.result.child1Id;
|
placementOfficer.child1OldId = org.result.child1Id;
|
||||||
placementOfficer.child1ShortName = org.result.child1ShortName;
|
placementOfficer.child1ShortNameOld = org.result.child1ShortName;
|
||||||
placementOfficer.child2 = org.result.child2;
|
placementOfficer.child2Old = org.result.child2;
|
||||||
placementOfficer.child2Id = org.result.child2Id;
|
placementOfficer.child2OldId = org.result.child2Id;
|
||||||
placementOfficer.child2ShortName = org.result.child2ShortName;
|
placementOfficer.child2ShortNameOld = org.result.child2ShortName;
|
||||||
placementOfficer.child3 = org.result.child3;
|
placementOfficer.child3Old = org.result.child3;
|
||||||
placementOfficer.child3Id = org.result.child3Id;
|
placementOfficer.child3OldId = org.result.child3Id;
|
||||||
placementOfficer.child3ShortName = org.result.child3ShortName;
|
placementOfficer.child3ShortNameOld = org.result.child3ShortName;
|
||||||
placementOfficer.child4 = org.result.child4;
|
placementOfficer.child4Old = org.result.child4;
|
||||||
placementOfficer.child4Id = org.result.child4Id;
|
placementOfficer.child4OldId = org.result.child4Id;
|
||||||
placementOfficer.child4ShortName = org.result.child4ShortName;
|
placementOfficer.child4ShortNameOld = org.result.child4ShortName;
|
||||||
placementOfficer.posMasterNo = org.result.posMasterNo;
|
placementOfficer.posMasterNoOld = org.result.posMasterNo;
|
||||||
placementOfficer.position = org.result.position;
|
placementOfficer.posTypeOldId = org.result.posTypeId;
|
||||||
placementOfficer.posTypeId = org.result.posTypeId;
|
placementOfficer.posTypeNameOld = org.result.posTypeName;
|
||||||
placementOfficer.posTypeName = org.result.posTypeName;
|
placementOfficer.posLevelOldId = org.result.posLevelId;
|
||||||
placementOfficer.posLevelId = org.result.posLevelId;
|
placementOfficer.posLevelNameOld = org.result.posLevelName;
|
||||||
placementOfficer.posLevelName = org.result.posLevelName;
|
|
||||||
|
|
||||||
placementOfficer.PositionOld = org.result.position;
|
placementOfficer.PositionOld = org.result.position;
|
||||||
placementOfficer.PositionLevelOld = org.result.posLevelName;
|
placementOfficer.PositionLevelOld = org.result.posLevelName;
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
|
|
||||||
var placementRepatriations = await _context.PlacementRepatriations.AsQueryable()
|
var placementRepatriations = await _context.PlacementRepatriations.AsQueryable()
|
||||||
.OrderByDescending(x => x.CreatedAt)
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||||
.Select(p => new
|
.Select(p => new
|
||||||
{
|
{
|
||||||
p.Id,
|
p.Id,
|
||||||
|
|
@ -100,20 +100,27 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.PositionOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
|
|
@ -154,20 +161,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
p.Status,
|
p.Status,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
|
|
@ -229,27 +242,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
placementRepatriation.firstName = org.result.firstName;
|
placementRepatriation.firstName = org.result.firstName;
|
||||||
placementRepatriation.lastName = org.result.lastName;
|
placementRepatriation.lastName = org.result.lastName;
|
||||||
placementRepatriation.citizenId = org.result.citizenId;
|
placementRepatriation.citizenId = org.result.citizenId;
|
||||||
placementRepatriation.root = org.result.root;
|
placementRepatriation.rootOld = org.result.root;
|
||||||
placementRepatriation.rootId = org.result.rootId;
|
placementRepatriation.rootOldId = org.result.rootId;
|
||||||
placementRepatriation.rootShortName = org.result.rootShortName;
|
placementRepatriation.rootShortNameOld = org.result.rootShortName;
|
||||||
placementRepatriation.child1 = org.result.child1;
|
placementRepatriation.child1Old = org.result.child1;
|
||||||
placementRepatriation.child1Id = org.result.child1Id;
|
placementRepatriation.child1OldId = org.result.child1Id;
|
||||||
placementRepatriation.child1ShortName = org.result.child1ShortName;
|
placementRepatriation.child1ShortNameOld = org.result.child1ShortName;
|
||||||
placementRepatriation.child2 = org.result.child2;
|
placementRepatriation.child2Old = org.result.child2;
|
||||||
placementRepatriation.child2Id = org.result.child2Id;
|
placementRepatriation.child2OldId = org.result.child2Id;
|
||||||
placementRepatriation.child2ShortName = org.result.child2ShortName;
|
placementRepatriation.child2ShortNameOld = org.result.child2ShortName;
|
||||||
placementRepatriation.child3 = org.result.child3;
|
placementRepatriation.child3Old = org.result.child3;
|
||||||
placementRepatriation.child3Id = org.result.child3Id;
|
placementRepatriation.child3OldId = org.result.child3Id;
|
||||||
placementRepatriation.child3ShortName = org.result.child3ShortName;
|
placementRepatriation.child3ShortNameOld = org.result.child3ShortName;
|
||||||
placementRepatriation.child4 = org.result.child4;
|
placementRepatriation.child4Old = org.result.child4;
|
||||||
placementRepatriation.child4Id = org.result.child4Id;
|
placementRepatriation.child4OldId = org.result.child4Id;
|
||||||
placementRepatriation.child4ShortName = org.result.child4ShortName;
|
placementRepatriation.child4ShortNameOld = org.result.child4ShortName;
|
||||||
placementRepatriation.posMasterNo = org.result.posMasterNo;
|
placementRepatriation.posMasterNoOld = org.result.posMasterNo;
|
||||||
placementRepatriation.position = org.result.position;
|
placementRepatriation.posTypeOldId = org.result.posTypeId;
|
||||||
placementRepatriation.posTypeId = org.result.posTypeId;
|
placementRepatriation.posTypeNameOld = org.result.posTypeName;
|
||||||
placementRepatriation.posTypeName = org.result.posTypeName;
|
placementRepatriation.posLevelOldId = org.result.posLevelId;
|
||||||
placementRepatriation.posLevelId = org.result.posLevelId;
|
placementRepatriation.posLevelNameOld = org.result.posLevelName;
|
||||||
placementRepatriation.posLevelName = org.result.posLevelName;
|
|
||||||
|
|
||||||
placementRepatriation.PositionOld = org.result.position;
|
placementRepatriation.PositionOld = org.result.position;
|
||||||
placementRepatriation.PositionLevelOld = org.result.posLevelName;
|
placementRepatriation.PositionLevelOld = org.result.posLevelName;
|
||||||
|
|
|
||||||
|
|
@ -90,20 +90,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
|
|
@ -157,39 +163,46 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
|
|
||||||
var placementTransfers = await _context.PlacementTransfers.AsQueryable()
|
var placementTransfers = await _context.PlacementTransfers.AsQueryable()
|
||||||
.OrderByDescending(x => x.CreatedAt)
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||||
.Select(p => new
|
.Select(p => new
|
||||||
{
|
{
|
||||||
p.Id,
|
p.Id,
|
||||||
p.profileId,
|
p.profileId,
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
p.CreatedAt,
|
p.child4ShortNameOld,
|
||||||
p.Organization,
|
p.PositionOld,
|
||||||
p.Reason,
|
p.posMasterNoOld,
|
||||||
p.Status,
|
p.posTypeOldId,
|
||||||
p.Date,
|
p.posTypeNameOld,
|
||||||
salary = p.AmountOld,
|
p.posLevelOldId,
|
||||||
p.PositionTypeOld,
|
p.posLevelNameOld,
|
||||||
p.PositionLevelOld,
|
p.CreatedAt,
|
||||||
p.PositionNumberOld,
|
p.Organization,
|
||||||
p.OrganizationPositionOld,
|
p.Reason,
|
||||||
p.IsActive,
|
p.Status,
|
||||||
|
p.Date,
|
||||||
|
salary = p.AmountOld,
|
||||||
|
p.PositionTypeOld,
|
||||||
|
p.PositionLevelOld,
|
||||||
|
p.PositionNumberOld,
|
||||||
|
p.OrganizationPositionOld,
|
||||||
|
p.IsActive,
|
||||||
})
|
})
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
|
|
@ -218,20 +231,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
p.Status,
|
p.Status,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
|
|
@ -266,20 +285,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
data.prefix,
|
data.prefix,
|
||||||
data.firstName,
|
data.firstName,
|
||||||
data.lastName,
|
data.lastName,
|
||||||
data.root,
|
data.rootOld,
|
||||||
data.rootShortName,
|
data.rootOldId,
|
||||||
data.child1,
|
data.rootShortNameOld,
|
||||||
data.child1ShortName,
|
data.child1Old,
|
||||||
data.child2,
|
data.child1OldId,
|
||||||
data.child2ShortName,
|
data.child1ShortNameOld,
|
||||||
data.child3,
|
data.child2Old,
|
||||||
data.child3ShortName,
|
data.child2OldId,
|
||||||
data.child4,
|
data.child2ShortNameOld,
|
||||||
data.child4ShortName,
|
data.child3Old,
|
||||||
data.posMasterNo,
|
data.child3OldId,
|
||||||
data.position,
|
data.child3ShortNameOld,
|
||||||
data.posLevelName,
|
data.child4Old,
|
||||||
data.posTypeName,
|
data.child4OldId,
|
||||||
|
data.child4ShortNameOld,
|
||||||
|
data.posMasterNoOld,
|
||||||
|
data.posTypeOldId,
|
||||||
|
data.posTypeNameOld,
|
||||||
|
data.posLevelOldId,
|
||||||
|
data.posLevelNameOld,
|
||||||
data.Reason,
|
data.Reason,
|
||||||
data.Status,
|
data.Status,
|
||||||
data.Organization,
|
data.Organization,
|
||||||
|
|
@ -318,20 +343,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
p.Status,
|
p.Status,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
|
|
@ -366,20 +397,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
data.prefix,
|
data.prefix,
|
||||||
data.firstName,
|
data.firstName,
|
||||||
data.lastName,
|
data.lastName,
|
||||||
data.root,
|
data.rootOld,
|
||||||
data.rootShortName,
|
data.rootOldId,
|
||||||
data.child1,
|
data.rootShortNameOld,
|
||||||
data.child1ShortName,
|
data.child1Old,
|
||||||
data.child2,
|
data.child1OldId,
|
||||||
data.child2ShortName,
|
data.child1ShortNameOld,
|
||||||
data.child3,
|
data.child2Old,
|
||||||
data.child3ShortName,
|
data.child2OldId,
|
||||||
data.child4,
|
data.child2ShortNameOld,
|
||||||
data.child4ShortName,
|
data.child3Old,
|
||||||
data.posMasterNo,
|
data.child3OldId,
|
||||||
data.position,
|
data.child3ShortNameOld,
|
||||||
data.posLevelName,
|
data.child4Old,
|
||||||
data.posTypeName,
|
data.child4OldId,
|
||||||
|
data.child4ShortNameOld,
|
||||||
|
data.posMasterNoOld,
|
||||||
|
data.posTypeOldId,
|
||||||
|
data.posTypeNameOld,
|
||||||
|
data.posLevelOldId,
|
||||||
|
data.posLevelNameOld,
|
||||||
data.Reason,
|
data.Reason,
|
||||||
data.Status,
|
data.Status,
|
||||||
data.Organization,
|
data.Organization,
|
||||||
|
|
@ -438,27 +475,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
placementTransfer.firstName = org.result.firstName;
|
placementTransfer.firstName = org.result.firstName;
|
||||||
placementTransfer.lastName = org.result.lastName;
|
placementTransfer.lastName = org.result.lastName;
|
||||||
placementTransfer.citizenId = org.result.citizenId;
|
placementTransfer.citizenId = org.result.citizenId;
|
||||||
placementTransfer.root = org.result.root;
|
placementTransfer.rootOld = org.result.root;
|
||||||
placementTransfer.rootId = org.result.rootId;
|
placementTransfer.rootOldId = org.result.rootId;
|
||||||
placementTransfer.rootShortName = org.result.rootShortName;
|
placementTransfer.rootShortNameOld = org.result.rootShortName;
|
||||||
placementTransfer.child1 = org.result.child1;
|
placementTransfer.child1Old = org.result.child1;
|
||||||
placementTransfer.child1Id = org.result.child1Id;
|
placementTransfer.child1OldId = org.result.child1Id;
|
||||||
placementTransfer.child1ShortName = org.result.child1ShortName;
|
placementTransfer.child1ShortNameOld = org.result.child1ShortName;
|
||||||
placementTransfer.child2 = org.result.child2;
|
placementTransfer.child2Old = org.result.child2;
|
||||||
placementTransfer.child2Id = org.result.child2Id;
|
placementTransfer.child2OldId = org.result.child2Id;
|
||||||
placementTransfer.child2ShortName = org.result.child2ShortName;
|
placementTransfer.child2ShortNameOld = org.result.child2ShortName;
|
||||||
placementTransfer.child3 = org.result.child3;
|
placementTransfer.child3Old = org.result.child3;
|
||||||
placementTransfer.child3Id = org.result.child3Id;
|
placementTransfer.child3OldId = org.result.child3Id;
|
||||||
placementTransfer.child3ShortName = org.result.child3ShortName;
|
placementTransfer.child3ShortNameOld = org.result.child3ShortName;
|
||||||
placementTransfer.child4 = org.result.child4;
|
placementTransfer.child4Old = org.result.child4;
|
||||||
placementTransfer.child4Id = org.result.child4Id;
|
placementTransfer.child4OldId = org.result.child4Id;
|
||||||
placementTransfer.child4ShortName = org.result.child4ShortName;
|
placementTransfer.child4ShortNameOld = org.result.child4ShortName;
|
||||||
placementTransfer.posMasterNo = org.result.posMasterNo;
|
placementTransfer.posMasterNoOld = org.result.posMasterNo;
|
||||||
placementTransfer.position = org.result.position;
|
placementTransfer.posTypeOldId = org.result.posTypeId;
|
||||||
placementTransfer.posTypeId = org.result.posTypeId;
|
placementTransfer.posTypeNameOld = org.result.posTypeName;
|
||||||
placementTransfer.posTypeName = org.result.posTypeName;
|
placementTransfer.posLevelOldId = org.result.posLevelId;
|
||||||
placementTransfer.posLevelId = org.result.posLevelId;
|
placementTransfer.posLevelNameOld = org.result.posLevelName;
|
||||||
placementTransfer.posLevelName = org.result.posLevelName;
|
|
||||||
|
|
||||||
placementTransfer.PositionOld = org.result.position;
|
placementTransfer.PositionOld = org.result.position;
|
||||||
placementTransfer.PositionLevelOld = org.result.posLevelName;
|
placementTransfer.PositionLevelOld = org.result.posLevelName;
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
|
|
||||||
var retirementOthers = await _context.RetirementOthers.AsQueryable()
|
var retirementOthers = await _context.RetirementOthers.AsQueryable()
|
||||||
.OrderByDescending(x => x.CreatedAt)
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||||
.Select(p => new
|
.Select(p => new
|
||||||
{
|
{
|
||||||
p.Id,
|
p.Id,
|
||||||
|
|
@ -100,20 +100,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.PositionOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.Status,
|
p.Status,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
|
|
@ -154,20 +161,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.Status,
|
p.Status,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
|
|
@ -309,27 +322,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
retirementOther.firstName = org.result.firstName;
|
retirementOther.firstName = org.result.firstName;
|
||||||
retirementOther.lastName = org.result.lastName;
|
retirementOther.lastName = org.result.lastName;
|
||||||
retirementOther.citizenId = org.result.citizenId;
|
retirementOther.citizenId = org.result.citizenId;
|
||||||
retirementOther.root = org.result.root;
|
retirementOther.rootOld = org.result.root;
|
||||||
retirementOther.rootId = org.result.rootId;
|
retirementOther.rootOldId = org.result.rootId;
|
||||||
retirementOther.rootShortName = org.result.rootShortName;
|
retirementOther.rootShortNameOld = org.result.rootShortName;
|
||||||
retirementOther.child1 = org.result.child1;
|
retirementOther.child1Old = org.result.child1;
|
||||||
retirementOther.child1Id = org.result.child1Id;
|
retirementOther.child1OldId = org.result.child1Id;
|
||||||
retirementOther.child1ShortName = org.result.child1ShortName;
|
retirementOther.child1ShortNameOld = org.result.child1ShortName;
|
||||||
retirementOther.child2 = org.result.child2;
|
retirementOther.child2Old = org.result.child2;
|
||||||
retirementOther.child2Id = org.result.child2Id;
|
retirementOther.child2OldId = org.result.child2Id;
|
||||||
retirementOther.child2ShortName = org.result.child2ShortName;
|
retirementOther.child2ShortNameOld = org.result.child2ShortName;
|
||||||
retirementOther.child3 = org.result.child3;
|
retirementOther.child3Old = org.result.child3;
|
||||||
retirementOther.child3Id = org.result.child3Id;
|
retirementOther.child3OldId = org.result.child3Id;
|
||||||
retirementOther.child3ShortName = org.result.child3ShortName;
|
retirementOther.child3ShortNameOld = org.result.child3ShortName;
|
||||||
retirementOther.child4 = org.result.child4;
|
retirementOther.child4Old = org.result.child4;
|
||||||
retirementOther.child4Id = org.result.child4Id;
|
retirementOther.child4OldId = org.result.child4Id;
|
||||||
retirementOther.child4ShortName = org.result.child4ShortName;
|
retirementOther.child4ShortNameOld = org.result.child4ShortName;
|
||||||
retirementOther.posMasterNo = org.result.posMasterNo;
|
retirementOther.posMasterNoOld = org.result.posMasterNo;
|
||||||
retirementOther.position = org.result.position;
|
retirementOther.posTypeOldId = org.result.posTypeId;
|
||||||
retirementOther.posTypeId = org.result.posTypeId;
|
retirementOther.posTypeNameOld = org.result.posTypeName;
|
||||||
retirementOther.posTypeName = org.result.posTypeName;
|
retirementOther.posLevelOldId = org.result.posLevelId;
|
||||||
retirementOther.posLevelId = org.result.posLevelId;
|
retirementOther.posLevelNameOld = org.result.posLevelName;
|
||||||
retirementOther.posLevelName = org.result.posLevelName;
|
|
||||||
|
|
||||||
retirementOther.PositionOld = org.result.position;
|
retirementOther.PositionOld = org.result.position;
|
||||||
retirementOther.PositionLevelOld = org.result.posLevelName;
|
retirementOther.PositionLevelOld = org.result.posLevelName;
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
|
|
||||||
var retirementOuts = await _context.RetirementOuts.AsQueryable()
|
var retirementOuts = await _context.RetirementOuts.AsQueryable()
|
||||||
.OrderByDescending(x => x.CreatedAt)
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||||
.Select(p => new
|
.Select(p => new
|
||||||
{
|
{
|
||||||
p.Id,
|
p.Id,
|
||||||
|
|
@ -100,20 +100,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.PositionOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.CreatedAt,
|
p.CreatedAt,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
|
|
@ -153,20 +160,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
p.prefix,
|
p.prefix,
|
||||||
p.firstName,
|
p.firstName,
|
||||||
p.lastName,
|
p.lastName,
|
||||||
p.root,
|
p.rootOld,
|
||||||
p.rootShortName,
|
p.rootOldId,
|
||||||
p.child1,
|
p.rootShortNameOld,
|
||||||
p.child1ShortName,
|
p.child1Old,
|
||||||
p.child2,
|
p.child1OldId,
|
||||||
p.child2ShortName,
|
p.child1ShortNameOld,
|
||||||
p.child3,
|
p.child2Old,
|
||||||
p.child3ShortName,
|
p.child2OldId,
|
||||||
p.child4,
|
p.child2ShortNameOld,
|
||||||
p.child4ShortName,
|
p.child3Old,
|
||||||
p.posMasterNo,
|
p.child3OldId,
|
||||||
p.position,
|
p.child3ShortNameOld,
|
||||||
p.posLevelName,
|
p.child4Old,
|
||||||
p.posTypeName,
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
p.Reason,
|
p.Reason,
|
||||||
p.Status,
|
p.Status,
|
||||||
p.Organization,
|
p.Organization,
|
||||||
|
|
@ -270,27 +283,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
retirementOut.firstName = org.result.firstName;
|
retirementOut.firstName = org.result.firstName;
|
||||||
retirementOut.lastName = org.result.lastName;
|
retirementOut.lastName = org.result.lastName;
|
||||||
retirementOut.citizenId = org.result.citizenId;
|
retirementOut.citizenId = org.result.citizenId;
|
||||||
retirementOut.root = org.result.root;
|
retirementOut.rootOld = org.result.root;
|
||||||
retirementOut.rootId = org.result.rootId;
|
retirementOut.rootOldId = org.result.rootId;
|
||||||
retirementOut.rootShortName = org.result.rootShortName;
|
retirementOut.rootShortNameOld = org.result.rootShortName;
|
||||||
retirementOut.child1 = org.result.child1;
|
retirementOut.child1Old = org.result.child1;
|
||||||
retirementOut.child1Id = org.result.child1Id;
|
retirementOut.child1OldId = org.result.child1Id;
|
||||||
retirementOut.child1ShortName = org.result.child1ShortName;
|
retirementOut.child1ShortNameOld = org.result.child1ShortName;
|
||||||
retirementOut.child2 = org.result.child2;
|
retirementOut.child2Old = org.result.child2;
|
||||||
retirementOut.child2Id = org.result.child2Id;
|
retirementOut.child2OldId = org.result.child2Id;
|
||||||
retirementOut.child2ShortName = org.result.child2ShortName;
|
retirementOut.child2ShortNameOld = org.result.child2ShortName;
|
||||||
retirementOut.child3 = org.result.child3;
|
retirementOut.child3Old = org.result.child3;
|
||||||
retirementOut.child3Id = org.result.child3Id;
|
retirementOut.child3OldId = org.result.child3Id;
|
||||||
retirementOut.child3ShortName = org.result.child3ShortName;
|
retirementOut.child3ShortNameOld = org.result.child3ShortName;
|
||||||
retirementOut.child4 = org.result.child4;
|
retirementOut.child4Old = org.result.child4;
|
||||||
retirementOut.child4Id = org.result.child4Id;
|
retirementOut.child4OldId = org.result.child4Id;
|
||||||
retirementOut.child4ShortName = org.result.child4ShortName;
|
retirementOut.child4ShortNameOld = org.result.child4ShortName;
|
||||||
retirementOut.posMasterNo = org.result.posMasterNo;
|
retirementOut.posMasterNoOld = org.result.posMasterNo;
|
||||||
retirementOut.position = org.result.position;
|
retirementOut.posTypeOldId = org.result.posTypeId;
|
||||||
retirementOut.posTypeId = org.result.posTypeId;
|
retirementOut.posTypeNameOld = org.result.posTypeName;
|
||||||
retirementOut.posTypeName = org.result.posTypeName;
|
retirementOut.posLevelOldId = org.result.posLevelId;
|
||||||
retirementOut.posLevelId = org.result.posLevelId;
|
retirementOut.posLevelNameOld = org.result.posLevelName;
|
||||||
retirementOut.posLevelName = org.result.posLevelName;
|
|
||||||
|
|
||||||
retirementOut.PositionOld = org.result.position;
|
retirementOut.PositionOld = org.result.position;
|
||||||
retirementOut.PositionLevelOld = org.result.posLevelName;
|
retirementOut.PositionLevelOld = org.result.posLevelName;
|
||||||
|
|
|
||||||
|
|
@ -247,10 +247,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
p.OfficerRejectReason,
|
p.OfficerRejectReason,
|
||||||
p.OfficerRejectDate,
|
p.OfficerRejectDate,
|
||||||
p.RemarkHorizontal,
|
p.RemarkHorizontal,
|
||||||
p.position,
|
p.rootOld,
|
||||||
p.posTypeName,
|
p.rootOldId,
|
||||||
p.posLevelName,
|
p.rootShortNameOld,
|
||||||
p.posMasterNo,
|
p.child1Old,
|
||||||
|
p.child1OldId,
|
||||||
|
p.child1ShortNameOld,
|
||||||
|
p.child2Old,
|
||||||
|
p.child2OldId,
|
||||||
|
p.child2ShortNameOld,
|
||||||
|
p.child3Old,
|
||||||
|
p.child3OldId,
|
||||||
|
p.child3ShortNameOld,
|
||||||
|
p.child4Old,
|
||||||
|
p.child4OldId,
|
||||||
|
p.child4ShortNameOld,
|
||||||
|
p.PositionOld,
|
||||||
|
p.posMasterNoOld,
|
||||||
|
p.posTypeOldId,
|
||||||
|
p.posTypeNameOld,
|
||||||
|
p.posLevelOldId,
|
||||||
|
p.posLevelNameOld,
|
||||||
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
|
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
|
||||||
RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||||
// RetirementResignDebtDocs = p.RetirementResignDebtDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
// RetirementResignDebtDocs = p.RetirementResignDebtDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||||
|
|
@ -316,10 +333,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
data.OfficerRejectReason,
|
data.OfficerRejectReason,
|
||||||
data.OfficerRejectDate,
|
data.OfficerRejectDate,
|
||||||
data.RemarkHorizontal,
|
data.RemarkHorizontal,
|
||||||
data.position,
|
data.rootOld,
|
||||||
data.posTypeName,
|
data.rootOldId,
|
||||||
data.posLevelName,
|
data.rootShortNameOld,
|
||||||
data.posMasterNo,
|
data.child1Old,
|
||||||
|
data.child1OldId,
|
||||||
|
data.child1ShortNameOld,
|
||||||
|
data.child2Old,
|
||||||
|
data.child2OldId,
|
||||||
|
data.child2ShortNameOld,
|
||||||
|
data.child3Old,
|
||||||
|
data.child3OldId,
|
||||||
|
data.child3ShortNameOld,
|
||||||
|
data.child4Old,
|
||||||
|
data.child4OldId,
|
||||||
|
data.child4ShortNameOld,
|
||||||
|
data.PositionOld,
|
||||||
|
data.posMasterNoOld,
|
||||||
|
data.posTypeOldId,
|
||||||
|
data.posTypeNameOld,
|
||||||
|
data.posLevelOldId,
|
||||||
|
data.posLevelNameOld,
|
||||||
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||||
Docs = retirementResignDocs,
|
Docs = retirementResignDocs,
|
||||||
// DocDebts = retirementResignDebtDocs,
|
// DocDebts = retirementResignDebtDocs,
|
||||||
|
|
@ -390,27 +424,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
retirementResign.firstName = org.result.firstName;
|
retirementResign.firstName = org.result.firstName;
|
||||||
retirementResign.lastName = org.result.lastName;
|
retirementResign.lastName = org.result.lastName;
|
||||||
retirementResign.citizenId = org.result.citizenId;
|
retirementResign.citizenId = org.result.citizenId;
|
||||||
retirementResign.root = org.result.root;
|
retirementResign.rootOld = org.result.root;
|
||||||
retirementResign.rootId = org.result.rootId;
|
retirementResign.rootOldId = org.result.rootId;
|
||||||
retirementResign.rootShortName = org.result.rootShortName;
|
retirementResign.rootShortNameOld = org.result.rootShortName;
|
||||||
retirementResign.child1 = org.result.child1;
|
retirementResign.child1Old = org.result.child1;
|
||||||
retirementResign.child1Id = org.result.child1Id;
|
retirementResign.child1OldId = org.result.child1Id;
|
||||||
retirementResign.child1ShortName = org.result.child1ShortName;
|
retirementResign.child1ShortNameOld = org.result.child1ShortName;
|
||||||
retirementResign.child2 = org.result.child2;
|
retirementResign.child2Old = org.result.child2;
|
||||||
retirementResign.child2Id = org.result.child2Id;
|
retirementResign.child2OldId = org.result.child2Id;
|
||||||
retirementResign.child2ShortName = org.result.child2ShortName;
|
retirementResign.child2ShortNameOld = org.result.child2ShortName;
|
||||||
retirementResign.child3 = org.result.child3;
|
retirementResign.child3Old = org.result.child3;
|
||||||
retirementResign.child3Id = org.result.child3Id;
|
retirementResign.child3OldId = org.result.child3Id;
|
||||||
retirementResign.child3ShortName = org.result.child3ShortName;
|
retirementResign.child3ShortNameOld = org.result.child3ShortName;
|
||||||
retirementResign.child4 = org.result.child4;
|
retirementResign.child4Old = org.result.child4;
|
||||||
retirementResign.child4Id = org.result.child4Id;
|
retirementResign.child4OldId = org.result.child4Id;
|
||||||
retirementResign.child4ShortName = org.result.child4ShortName;
|
retirementResign.child4ShortNameOld = org.result.child4ShortName;
|
||||||
retirementResign.posMasterNo = org.result.posMasterNo;
|
retirementResign.posMasterNoOld = org.result.posMasterNo;
|
||||||
retirementResign.position = org.result.position;
|
retirementResign.posTypeOldId = org.result.posTypeId;
|
||||||
retirementResign.posTypeId = org.result.posTypeId;
|
retirementResign.posTypeNameOld = org.result.posTypeName;
|
||||||
retirementResign.posTypeName = org.result.posTypeName;
|
retirementResign.posLevelOldId = org.result.posLevelId;
|
||||||
retirementResign.posLevelId = org.result.posLevelId;
|
retirementResign.posLevelNameOld = org.result.posLevelName;
|
||||||
retirementResign.posLevelName = org.result.posLevelName;
|
|
||||||
|
|
||||||
retirementResign.PositionOld = org.result.position;
|
retirementResign.PositionOld = org.result.position;
|
||||||
retirementResign.PositionLevelOld = org.result.posLevelName;
|
retirementResign.PositionLevelOld = org.result.posLevelName;
|
||||||
|
|
@ -1007,8 +1040,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
{
|
{
|
||||||
Id = p.Id,
|
Id = p.Id,
|
||||||
Prefix = p.RetirementResign.prefix,
|
Prefix = p.RetirementResign.prefix,
|
||||||
Position = p.RetirementResign.position,
|
FirstName = p.RetirementResign.firstName,
|
||||||
PositionLevel = p.RetirementResign.posLevelName,
|
LastName = p.RetirementResign.lastName,
|
||||||
|
Position = p.RetirementResign.PositionOld,
|
||||||
|
PositionLevel = p.RetirementResign.posLevelNameOld,
|
||||||
Org = p.RetirementResign.OrganizationOld,
|
Org = p.RetirementResign.OrganizationOld,
|
||||||
Fullname = $"{p.RetirementResign.prefix}{p.RetirementResign.firstName} {p.RetirementResign.lastName}",
|
Fullname = $"{p.RetirementResign.prefix}{p.RetirementResign.firstName} {p.RetirementResign.lastName}",
|
||||||
// Avatar = p.RetirementResign.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.RetirementResign.Profile.Avatar.Id,
|
// Avatar = p.RetirementResign.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.RetirementResign.Profile.Avatar.Id,
|
||||||
|
|
@ -1032,11 +1067,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
LastUpdatedAt = p.LastUpdatedAt,
|
LastUpdatedAt = p.LastUpdatedAt,
|
||||||
OrganizationPositionOld = p.RetirementResign.OrganizationPositionOld,
|
OrganizationPositionOld = p.RetirementResign.OrganizationPositionOld,
|
||||||
CreatedAt = p.CreatedAt,
|
CreatedAt = p.CreatedAt,
|
||||||
position = p.RetirementResign.position,
|
posTypeName = p.RetirementResign.posTypeNameOld,
|
||||||
posTypeName = p.RetirementResign.posTypeName,
|
posLevelName = p.RetirementResign.posLevelNameOld,
|
||||||
posLevelName = p.RetirementResign.posLevelName,
|
posMasterNo = p.RetirementResign.posMasterNoOld,
|
||||||
posMasterNo = p.RetirementResign.posMasterNo,
|
root = p.RetirementResign.rootOld,
|
||||||
|
rootShortName = p.RetirementResign.rootShortNameOld,
|
||||||
|
child1 = p.RetirementResign.child1Old,
|
||||||
|
child1ShortName = p.RetirementResign.child1ShortNameOld,
|
||||||
|
child2 = p.RetirementResign.child2Old,
|
||||||
|
child2ShortName = p.RetirementResign.child2ShortNameOld,
|
||||||
|
child3 = p.RetirementResign.child3Old,
|
||||||
|
child3ShortName = p.RetirementResign.child3ShortNameOld,
|
||||||
|
child4 = p.RetirementResign.child4Old,
|
||||||
|
child4ShortName = p.RetirementResign.child4ShortNameOld,
|
||||||
Score1 = p.Score1,
|
Score1 = p.Score1,
|
||||||
Score2 = p.Score2,
|
Score2 = p.Score2,
|
||||||
Score3 = p.Score3,
|
Score3 = p.Score3,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue