工作量总额修改

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "PerformanceConnectionString": "server=192.168.18.166;database=db_test_beiliu;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
-    //"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
+    //"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=suvalue;pwd=suvalue2017;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
   },
   "AppOptions": {
     "OpenOAuth": true

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -166,7 +166,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                 // 只显示合计没有详情
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核后绩效.ToString(), Total = special.First().GiveFee ?? 0, StandOut = true });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核后其他绩效.ToString(), Total = special.First().AssessLaterOtherFee ?? 0 });
-                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.调节系数.ToString(), Total = special.First().Adjust?? 1 });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.调节系数.ToString(), Total = special.First().Adjust ?? 1 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.实发绩效.ToString(), Total = special.First().RealGiveFee ?? 0, StandOut = true });
                 #endregion
             }
@@ -301,13 +301,13 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                             { "药占比系数", "" },
                             { "CMI系数", "" },
                             { "工作量倾斜", "" },
-                            { "金额", ValueFormating(postDatas.Sum(w => w.IsFactor == 1 ? (w.CellValue * (w.FactorValue ?? 0)) : w.CellValue),"") },
+                            { "金额", ValueFormating(account.WorkloadFee,"") },
                         });
                         DeleteBlankColumn(items);
 
-                        var amount = basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal != 1)?.Sum(t => t.IsFactor == 1 ? t.CellValue * (t.FactorValue ?? 0) : t.CellValue) ?? 0;
-                        detailItemWorkloads.Total = amount;
-                        detailItemWorkloads.TotalFormat = ValueFormating(amount, "");
+                        //var amount = basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal != 1)?.Sum(t => t.IsFactor == 1 ? t.CellValue * (t.FactorValue ?? 0) : t.CellValue) ?? 0;
+                        detailItemWorkloads.Total = account.WorkloadFee ?? 0m;
+                        detailItemWorkloads.TotalFormat = ValueFormating(account.WorkloadFee, "");
                         detailItemWorkloads.Items = items;
                     }
                 }