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

no message

Browse source
This commit is contained in:
kittapath 2024-10-28 09:57:11 +07:00
parent b9814bd346
commit d356332718
11 changed files with 515 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1013,7 +1013,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
var resultData = (from p in data
var report_data = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
select new
@ -1025,7 +1025,21 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
salary = r.Amount
}).ToList();
return Success(resultData);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
organizationname = _null,
salary = _null,
});
}
return Success(result);
}
catch
{