|
|
@@ -96,11 +96,11 @@ export default {
|
|
|
roundGroups,
|
|
|
rg => rg.expectedCount * 1,
|
|
|
rg => {
|
|
|
- const approvedCount = data.find(item => item.category == 'approvedCount')?.values
|
|
|
+ const acceptCount = data.find(item => item.category == 'acceptCount')?.values
|
|
|
.find(item => item.groupId == rg.groupId)?.value || 0
|
|
|
const forcedCount = data.find(item => item.category == 'forcedCount')?.values
|
|
|
.find(item => item.groupId == rg.groupId)?.value || 0
|
|
|
- const enrollCount = approvedCount * 1 + forcedCount * 1
|
|
|
+ const enrollCount = acceptCount * 1 + forcedCount * 1
|
|
|
valueNameGroup.values.push({ value: enrollCount, name: rg.groupName })
|
|
|
return enrollCount
|
|
|
},
|
