Merge branch 'v2020morge' into feature/20201109

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeWorkload.cs

@@ -166,14 +166,14 @@ public PerSheet OnceCompute(PerSheet sheet, List<CofDrugProp> confs = null)
                         cellvalue = cmifactor * cellvalue;
                     }
                     return cellvalue;
-                }) * factor;
+                });
 
                 value += ngroup.Sum(s =>
                 {
                     var cellvalue = s.IsFactor ? s.CellValue * s.FactorValue : s.CellValue;
                     if (workitems.Any(w => w.Type == 1) && workitems.Where(w => w.Type == 1).Select(q => q.Item).Contains(s.TypeName))
                     {
-                        cellvalue = cmifactor * cellvalue;
+                        cellvalue = factor * cellvalue;
                     }
                     return cellvalue;
                 });