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

สรุปผลวินัยเพิ่มstatusบุคคล

Browse source
This commit is contained in:
Kittapath 2023-12-01 21:44:16 +07:00
parent 49d70b1e05
commit 8dae449c62
10 changed files with 11384 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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();