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

Merge branch 'develop' into work

Browse source 
# Conflicts:
#	BMA.EHR.Application/ApplicationServicesRegistration.cs
#	BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs
#	BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
#	BMA.EHR.Solution.sln
This commit is contained in:
Kittapath 2023-07-13 09:57:58 +07:00
commit 8edfbc7466
70 changed files with 21946 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Infrastructure/Storage/MinIOService.cs
View file

@ -202,7 +202,7 @@ namespace BMA.EHR.Application.Repositories
BucketName = _bucketName,
Key = doc?.ObjectRefId.ToString("D"),
Expires = expires,
Protocol = _protocol =="HTTPS"?Protocol.HTTPS: Protocol.HTTP
Protocol = _protocol == "HTTPS" ? Protocol.HTTPS : Protocol.HTTP
};
string path = _s3Client.GetPreSignedURL(request);
@ -215,7 +215,7 @@ namespace BMA.EHR.Application.Repositories
try
{
var ret = new List<Guid>();
if(id == null)
if (id == null)
return ret;
var oc = _context.Organizations.FirstOrDefault(x => x.Id == id);
@ -245,12 +245,12 @@ namespace BMA.EHR.Application.Repositories
if (data == null)
return null;
if (data.ProfileType.Trim().ToUpper() == "OFFICER")
return "officer";
return "OFFICER";
if (data.EmployeeClass.Trim().ToUpper() == "PERM")
return "employee_perm";
return "EMPLOYEE_PERM";
if (data.EmployeeClass.Trim().ToUpper() == "TEMP")
return "employee_temp";
return "employee";
return "EMPLOYEE_TEMP";
return "EMPLOYEE";
}
}
}