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

fix code leave and insignia

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-08-26 11:58:42 +07:00
parent 5a208ebb17
commit 5319aa607b
10 changed files with 597 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
View file

@ -974,17 +974,18 @@ namespace BMA.EHR.Insignia.Service.Controllers
.Where(x => x.RequestStatus == "st1")
.Select(x => x.OrganizationId)
.ToListAsync();
var orgAllCount = await _context.Organizations
.Where(x => x.OrganizationOrganization != null)
.Where(x => x.OrganizationType != null)
.Where(x => x.OrganizationType.Name == "หน่วยงาน")
.Where(x => orgIdSend.Contains(x.Id))
var organizations = await _userProfileRepository.GetActiveRootAsync(AccessToken);
var orgAllCount = organizations
.Where(x => !orgIdSend.Contains(x.Id))
.Select(x => new
{
OrgId = x.Id,
OrgName = x.OrganizationOrganization.Name
OrgName = x.OrgRootName
})
.ToListAsync();
.ToList();
return Success(orgAllCount);
}

3
BMA.EHR.Insignia/appsettings.json
View file

@ -15,7 +15,8 @@
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
//"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"