|
@@ -945,12 +945,12 @@ namespace TEAMModelOS.FunctionV4
|
|
|
{
|
|
|
double score = 0;
|
|
|
double allScore = 0;
|
|
|
- int n = 0;
|
|
|
int count = 0;
|
|
|
foreach (ExamClassResult result in classResults)
|
|
|
{
|
|
|
if (result.subjectId.Equals(subject.id))
|
|
|
{
|
|
|
+ int n = 0;
|
|
|
foreach (List<string> str in info.papers[no].knowledge)
|
|
|
{
|
|
|
if (str.Contains(k))
|
|
@@ -1082,12 +1082,13 @@ namespace TEAMModelOS.FunctionV4
|
|
|
{
|
|
|
double score = 0;
|
|
|
double allScore = 0;
|
|
|
- int n = 0;
|
|
|
+
|
|
|
int count = 0;
|
|
|
foreach (ExamClassResult result in classResults)
|
|
|
{
|
|
|
if (result.subjectId.Equals(subject.id))
|
|
|
{
|
|
|
+ int n = 0;
|
|
|
foreach (int str in info.papers[no].field)
|
|
|
{
|
|
|
if (str == knowledgeName[i])
|
|
@@ -1106,10 +1107,10 @@ namespace TEAMModelOS.FunctionV4
|
|
|
}
|
|
|
n++;
|
|
|
}
|
|
|
-
|
|
|
count += result.studentIds.Count;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
double per = count > 0 ? Math.Round(score / count, 2) : 0;
|
|
|
afp.Add(allScore > 0 ? Math.Round(per / allScore, 2) : 0);
|
|
|
}
|