Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
This commit is contained in:
commit
08f2c8753e
10 changed files with 265 additions and 85 deletions
|
|
@ -1112,25 +1112,25 @@ export class PositionController extends Controller {
|
|||
totalPositionCurrentUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRootId: requestBody.id,
|
||||
profileIdCurrentHolder: Not(IsNull()) && Not(""),
|
||||
current_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionCurrentVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRootId: requestBody.id,
|
||||
profileIdCurrentHolder: IsNull() && "",
|
||||
current_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
totalPositionNextUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRootId: requestBody.id,
|
||||
profileIdNextHolder: Not(IsNull()) && Not(""),
|
||||
next_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionNextVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRootId: requestBody.id,
|
||||
profileIdNextHolder: IsNull() && "",
|
||||
next_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -1151,25 +1151,25 @@ export class PositionController extends Controller {
|
|||
totalPositionCurrentUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild1Id: requestBody.id,
|
||||
profileIdCurrentHolder: Not(IsNull()) && Not(""),
|
||||
current_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionCurrentVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild1Id: requestBody.id,
|
||||
profileIdCurrentHolder: IsNull() && "",
|
||||
current_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
totalPositionNextUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild1Id: requestBody.id,
|
||||
profileIdNextHolder: Not(IsNull()) && Not(""),
|
||||
next_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionNextVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild1Id: requestBody.id,
|
||||
profileIdNextHolder: IsNull() && "",
|
||||
next_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -1190,25 +1190,25 @@ export class PositionController extends Controller {
|
|||
totalPositionCurrentUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild2Id: requestBody.id,
|
||||
profileIdCurrentHolder: Not(IsNull()) && Not(""),
|
||||
current_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionCurrentVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild2Id: requestBody.id,
|
||||
profileIdCurrentHolder: IsNull() && "",
|
||||
current_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
totalPositionNextUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild2Id: requestBody.id,
|
||||
profileIdNextHolder: Not(IsNull()) && Not(""),
|
||||
next_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionNextVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild2Id: requestBody.id,
|
||||
profileIdNextHolder: IsNull() && "",
|
||||
next_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -1229,25 +1229,25 @@ export class PositionController extends Controller {
|
|||
totalPositionCurrentUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild3Id: requestBody.id,
|
||||
profileIdCurrentHolder: Not(IsNull()) && Not(""),
|
||||
current_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionCurrentVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild3Id: requestBody.id,
|
||||
profileIdCurrentHolder: IsNull() && "",
|
||||
current_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
totalPositionNextUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild3Id: requestBody.id,
|
||||
profileIdNextHolder: Not(IsNull()) && Not(""),
|
||||
next_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionNextVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild3Id: requestBody.id,
|
||||
profileIdNextHolder: IsNull() && "",
|
||||
next_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -1268,25 +1268,25 @@ export class PositionController extends Controller {
|
|||
totalPositionCurrentUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild4Id: requestBody.id,
|
||||
profileIdCurrentHolder: Not(IsNull()) && Not(""),
|
||||
current_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionCurrentVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild4Id: requestBody.id,
|
||||
profileIdCurrentHolder: IsNull() && "",
|
||||
current_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
totalPositionNextUse = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild4Id: requestBody.id,
|
||||
profileIdNextHolder: Not(IsNull()) && Not(""),
|
||||
next_holderId: Not(IsNull()) && Not(""),
|
||||
},
|
||||
});
|
||||
totalPositionNextVacant = await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgChild4Id: requestBody.id,
|
||||
profileIdNextHolder: IsNull() && "",
|
||||
next_holderId: IsNull() && "",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue