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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-30 11:55:55 +07:00
commit 22304e7186
4 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8952,6 +8952,7 @@ namespace BMA.EHR.Application.Repositories
MarkDiscipline = h.MarkDiscipline,
MarkLeave = h.MarkLeave,
MarkRate = h.MarkRate,
MarkInsignia = h.MarkInsignia,
MatchingConditions = h.MatchingConditions == null || h.MatchingConditions == ""
? null
: JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
@ -9111,7 +9112,7 @@ namespace BMA.EHR.Application.Repositories
LastUpdatedAt = DateTime.Now,
// Add Information for reused in API Call
ProfileType = item.ProfileType ?? "officer",
ProfileType = item.ProfileType != null && item.ProfileType != "" ? item.ProfileType.ToLower() : "officer",
Prefix = item.Prefix,
FirstName = item.FirstName,
LastName = item.LastName,
@ -9221,7 +9222,7 @@ namespace BMA.EHR.Application.Repositories
LastUpdatedAt = DateTime.Now,
// Add Information for reused in API Call
ProfileType = item.ProfileType ?? "officer",
ProfileType = item.ProfileType != null && item.ProfileType != "" ? item.ProfileType.ToLower() : "officer",
Prefix = item.Prefix,
FirstName = item.FirstName,
LastName = item.LastName,

12
BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
View file

@ -1590,11 +1590,11 @@ namespace BMA.EHR.Application.Repositories.Reports
if (type == "officer")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER");
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer");
}
else if (type == "employee")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE");
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee");
}
switch (node)
@ -1663,11 +1663,11 @@ namespace BMA.EHR.Application.Repositories.Reports
if (type == "officer")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER");
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer");
}
else if (type == "employee")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE");
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee");
}
switch (node)
@ -1736,11 +1736,11 @@ namespace BMA.EHR.Application.Repositories.Reports
if (type == "officer")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER");
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer");
}
else if (type == "employee")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE");
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee");
}
switch (node)