Merge branch 'develop5.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -579,7 +579,18 @@ namespace TEAMModelOS.Controllers.Analysis
             {
                 BadRequest(ex.StackTrace);
             }
-            var sub = info.subjects.Select(x => new
+
+            var sub  = examResults.Select(e => new {
+                    id = e.id,
+                    name = info.subjects.FirstOrDefault(c => c.id == e.id).name,
+                    record = e.record,
+                    phc = e.phc,
+                    plc = e.plc,
+                    sRate = e.sRate,
+                    average = e.average,
+                    standard = e.standard
+            });
+            /*var sub = info.subjects.Select(x => new
             {
                 id = x.id,
                 name = x.name,
@@ -589,7 +600,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 sRate = examResults.FirstOrDefault(c => c.id == x.id).sRate,
                 average = examResults.FirstOrDefault(c => c.id == x.id).average,
                 standard = examResults.FirstOrDefault(c => c.id == x.id).standard
-            });
+            });*/
             var subAll = new { sRate = info.sRate, average = info.average, standard = info.standard, total = info.stuCount };
             return Ok(new
             {