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

ส่งรายชื่อไปออกคำสั่ง C-PM-25, C-PM-26 ให้ปั๊ม commandCode #2377
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m56s
Details

Browse source
This commit is contained in:
harid 2026-04-03 16:03:01 +07:00
parent bf92f6933e
commit 8950073485
2 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1242,14 +1242,22 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpPost("command25/report")]
public async Task<ActionResult<ResponseObject>> PostReportCommand25([FromBody] ReportPersonRequest req)
public async Task<ActionResult<ResponseObject>> PostReportCommand25([FromBody] ReportPersonAndCommandRequest req)
{
try
{
var data = await _context.DisciplineReport_Profiles
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
// data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
data.ForEach(profile =>
{
profile.Status = !string.IsNullOrEmpty(req.status)
? req.status.Trim().ToUpper() : null;
profile.CommandTypeId = !string.IsNullOrEmpty(req.commandTypeId) && Guid.TryParse(req.commandTypeId, out var cmdTypeId)
? cmdTypeId : null;
profile.CommandCode = req.commandCode ?? null;
});
await _context.SaveChangesAsync();
return Success();
}
@ -1276,7 +1284,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.Where(x => req.refIds.Contains(x.Id.ToString()))
// .Where(x => x.Status.ToUpper() == "REPORT")
.ToListAsync();
data.ForEach(profile => profile.Status = "PENDING");
// data.ForEach(profile => profile.Status = "PENDING");
data.ForEach(profile =>
{
profile.Status = "PENDING";
profile.CommandTypeId = null;
profile.CommandCode = null;
});
await _context.SaveChangesAsync();
return Success();
}
@ -1429,14 +1443,22 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpPost("command26/report")]
public async Task<ActionResult<ResponseObject>> PostReportCommand26([FromBody] ReportPersonRequest req)
public async Task<ActionResult<ResponseObject>> PostReportCommand26([FromBody] ReportPersonAndCommandRequest req)
{
try
{
var data = await _context.DisciplineReport_Profiles
.Where(x => req.refIds.Contains(x.Id.ToString()))
.ToListAsync();
data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
// data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
data.ForEach(profile =>
{
profile.Status = !string.IsNullOrEmpty(req.status)
? req.status.Trim().ToUpper() : null;
profile.CommandTypeId = !string.IsNullOrEmpty(req.commandTypeId) && Guid.TryParse(req.commandTypeId, out var cmdTypeId)
? cmdTypeId : null;
profile.CommandCode = req.commandCode ?? null;
});
await _context.SaveChangesAsync();
return Success();
}
@ -1463,7 +1485,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.Where(x => req.refIds.Contains(x.Id.ToString()))
// .Where(x => x.Status.ToUpper() == "REPORT")
.ToListAsync();
data.ForEach(profile => profile.Status = "PENDING");
// data.ForEach(profile => profile.Status = "PENDING");
data.ForEach(profile =>
{
profile.Status = "PENDING";
profile.CommandTypeId = null;
profile.CommandCode = null;
});
await _context.SaveChangesAsync();
return Success();
}

8
BMA.EHR.Discipline.Service/Requests/ReportPersonRequest.cs
View file

@ -8,4 +8,12 @@ namespace BMA.EHR.Discipline.Service.Requests
public string[] refIds { get; set; }
public string? status { get; set; }
}
public class ReportPersonAndCommandRequest
{
public string[] refIds { get; set; }
public string? status { get; set; }
public string? commandTypeId { get; set; }
public string? commandCode { get; set; }
}
}