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

Merge branch 'work' into develop

Browse source
This commit is contained in:
Kittapath 2023-08-25 18:19:01 +07:00
commit dce5aaf778
27 changed files with 64049 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

@ -4983,7 +4983,7 @@ namespace BMA.EHR.Application.Repositories
IsApprove = h.IsApprove,
RequestDate = h.RequestDate,
Status = h.Status,
RequestNote = "",
RequestNote = h.Reason,
// Docs = GetDocFile(h.Profile.Id),
MatchingConditions = h.MatchingConditions == null ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
})).ToList();