Merge branch 'feature/新二次分配' into release/v20210709功能分支合并

performance/Performance.DtoModels/Second/SecondColumnDictionary.cs

@@ -39,7 +39,7 @@ public SecondColumnDictionary()
         {
         }
 
-        public SecondColumnDictionary(string label, string key, bool isTrue, int sort, string site = "Table", string type = "", string color = "")
+        public SecondColumnDictionary(string label, string key, bool isTrue, int sort, string site = "Table", string type = "", string color = "", int? width = null)
         {
             Label = label;
             Key = key;
@@ -48,7 +48,7 @@ public SecondColumnDictionary(string label, string key, bool isTrue, int sort, s
             Site = site;
             Type = type;
             Color = color;
-            Width = ((label ?? "").Length * 20 + 10).ToString();
+            Width = width.HasValue ? width.ToString() : ((label ?? "").Length * 20 + 10).ToString();
         }
     }
 }

performance/Performance.Services/RedistributionService.cs

@@ -192,6 +192,7 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
 
                 new SecondColumnDictionary("医院其他绩效",nameof(ag_bodysource.OtherPerformance),false,801, color: "referto_color" ),
                 new SecondColumnDictionary("实发绩效",nameof(ag_bodysource.ReferToRealAmount),false,802, color: "referto_color"),
+                new SecondColumnDictionary("备注",nameof(ag_bodysource.Remark),false,803,width:200),
             };
 
             // 工作量