สรุปผลวินัยเพิ่มstatusบุคคล
This commit is contained in:
Kittapath
parent
49d70b1e05
commit
8dae449c62
10 changed files with 11384 additions and 28 deletions
|
|
@ -211,6 +211,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
Salary = item.salary,
|
||||
PersonId = item.personId,
|
||||
PosNo = item.posNo,
|
||||
Status = "NEW",
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
|
|
@ -255,8 +256,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
Result = x.Result,//ผลการตรวจสอบ
|
||||
Director = x.DisciplineDisciplinary_DirectorInvestigates.Select(d => new
|
||||
{
|
||||
Id = d.Id,
|
||||
DirectorId = d.DisciplineDirector.Id,
|
||||
DirectorId = d.Id,
|
||||
Id = d.DisciplineDirector.Id,
|
||||
Prefix = d.DisciplineDirector.Prefix,
|
||||
FirstName = d.DisciplineDirector.FirstName,
|
||||
LastName = d.DisciplineDirector.LastName,
|
||||
|
|
@ -445,6 +446,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
PersonId = p.PersonId,
|
||||
PosNo = p.PosNo,
|
||||
Organization = p.Organization,
|
||||
Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
|
||||
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
||||
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
|
||||
DisciplineDisciplinary_DocRelevants = x.DisciplineDisciplinary_DocRelevants.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
|
|
@ -636,6 +638,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
Salary = item.salary,
|
||||
PersonId = item.personId,
|
||||
PosNo = item.posNo,
|
||||
Status = "NEW",
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
|
|
@ -1422,8 +1425,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
public async Task<ActionResult<ResponseObject>> PostToSuspend([FromBody] DisciplinePersonIdRequest req, Guid id)
|
||||
{
|
||||
var data = await _context.DisciplineDisciplinarys
|
||||
.Include(x => x.DisciplineReport_Profiles)
|
||||
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates)
|
||||
.ThenInclude(x => x.DisciplineReport_Profiles)
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
if (data == null)
|
||||
|
|
@ -1432,7 +1435,12 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
var persons = data.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => req.persons.Contains(x.Id)).ToList();
|
||||
foreach (var item in persons)
|
||||
{
|
||||
data.DisciplineReport_Profiles.Add(
|
||||
var personIdDupicate = data.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => x.PersonId == item.PersonId).FirstOrDefault();
|
||||
if (personIdDupicate == null)
|
||||
continue;
|
||||
if (personIdDupicate.DisciplineReport_Profiles.Count() > 0)
|
||||
continue;
|
||||
personIdDupicate.DisciplineReport_Profiles.Add(
|
||||
new DisciplineReport_Profile
|
||||
{
|
||||
PersonId = item.PersonId,
|
||||
|
|
|
|||
|
|
@ -250,8 +250,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
Result = x.Result,//ผลการตรวจสอบ
|
||||
Director = x.DisciplineInvestigate_Directors.Select(d => new
|
||||
{
|
||||
Id = d.Id,
|
||||
DirectorId = d.DisciplineDirector.Id,
|
||||
DirectorId = d.Id,
|
||||
Id = d.DisciplineDirector.Id,
|
||||
Prefix = d.DisciplineDirector.Prefix,
|
||||
FirstName = d.DisciplineDirector.FirstName,
|
||||
LastName = d.DisciplineDirector.LastName,
|
||||
|
|
@ -531,6 +531,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
PosNo = item.PosNo,
|
||||
Position = item.Position,
|
||||
PositionLevel = item.PositionLevel,
|
||||
Status = "NEW",
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
|
|
|
|||
|
|
@ -56,10 +56,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
public async Task<ActionResult<ResponseObject>> GetDisciplineResult(int page = 1, int pageSize = 25, string keyword = "")
|
||||
{
|
||||
var data_search = (from x in _context.DisciplineDisciplinarys
|
||||
where x.Title.Contains(keyword) ||
|
||||
// x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
|
||||
// x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
|
||||
x.Status == "DONE"
|
||||
where x.Title.Contains(keyword)
|
||||
// x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
|
||||
// x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
|
||||
select x).ToList();
|
||||
var data = data_search
|
||||
.Select(x => new
|
||||
|
|
@ -73,6 +72,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
Status = x.Status,//สถานะหรือผลการสอบสวน
|
||||
CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสอบสวน
|
||||
})
|
||||
.Where(x => x.Status == "DONE" || x.Status == "REPORT")
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
|
|
@ -112,9 +112,11 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
|
|||
PersonId = p.PersonId,
|
||||
PosNo = p.PosNo,
|
||||
Organization = p.Organization,
|
||||
Status = p.Status,
|
||||
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
||||
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
|
||||
ResultDescription = x.ResultDescription,//สรุปผลการพิจารณา
|
||||
Status = x.Status,//สถานะหรือผลการสอบสวน
|
||||
})
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
|
|||
|
|
@ -55,7 +55,9 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
[HttpGet()]
|
||||
public async Task<ActionResult<ResponseObject>> GetDisciplineSuspend(int page = 1, int pageSize = 25, string keyword = "")
|
||||
{
|
||||
var data_search = (from x in _context.DisciplineReport_Profiles.Include(x => x.DisciplineDisciplinary)
|
||||
var data_search = (from x in _context.DisciplineReport_Profiles
|
||||
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigate)
|
||||
.ThenInclude(x => x.DisciplineDisciplinary)
|
||||
where x.CitizenId.Contains(keyword) ||
|
||||
x.Prefix.Contains(keyword) ||
|
||||
x.FirstName.Contains(keyword) ||
|
||||
|
|
@ -64,7 +66,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
x.Position.Contains(keyword) ||
|
||||
x.PosNo.Contains(keyword) ||
|
||||
x.PositionLevel.Contains(keyword) ||
|
||||
x.DisciplineDisciplinary.Title.Contains(keyword)
|
||||
x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title.Contains(keyword)
|
||||
select x).ToList();
|
||||
var data = data_search
|
||||
.Select(x => new
|
||||
|
|
@ -83,10 +85,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
DescriptionSuspend = x.DescriptionSuspend,
|
||||
StartDateSuspend = x.StartDateSuspend,
|
||||
EndDateSuspend = x.EndDateSuspend,
|
||||
Title = x.DisciplineDisciplinary.Title,
|
||||
OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
|
||||
Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
|
||||
OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
|
||||
})
|
||||
.OrderByDescending(x => x.CitizenId)
|
||||
.Skip((page - 1) * pageSize)
|
||||
|
|
@ -123,10 +125,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
DescriptionSuspend = x.DescriptionSuspend,
|
||||
StartDateSuspend = x.StartDateSuspend,
|
||||
EndDateSuspend = x.EndDateSuspend,
|
||||
Title = x.DisciplineDisciplinary.Title,
|
||||
OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
|
||||
Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
|
||||
OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
|
||||
})
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue