科室绩效详情添加默认值修改显示的条件

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -1067,6 +1067,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.DownloadUniteDeptdetail(Performance.DtoModels.UniteDeptDetailRequest)">
+            <summary>
+            科室绩效详情下载
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ComputeController.DeptDetail(Performance.DtoModels.DeptDetailRequest)">
             <summary>
             科室绩效详情

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -357,17 +357,19 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                             if (string.IsNullOrEmpty(gs.Display))
                                 gs.Display = UniteDept.DisplayRule.始终显示.ToString();
 
-                            if (gs.Display == UniteDept.DisplayRule.始终显示.ToString() || !userInfo.IsSecondAdmin || allot.States == (int)AllotStates.绩效下发 || allot.States == (int)AllotStates.归档)
+                            if (gs.Display == UniteDept.DisplayRule.始终隐藏.ToString()) continue;
+
+                            var states = new int[] { (int)AllotStates.绩效下发, (int)AllotStates.归档 };
+                            if (gs.Display == UniteDept.DisplayRule.下发显示.ToString() && userInfo.IsSecondAdmin && !states.Contains(allot.States)) continue;
+
+                            var fz = post.Sum(group => group.IsFactor == 1 ? (group.CellValue * (group.FactorValue ?? 0)) : group.CellValue);
+                            var row = new Dictionary<string, object>
                             {
-                                var fz = post.Sum(group => group.IsFactor == 1 ? (group.CellValue * (group.FactorValue ?? 0)) : group.CellValue);
-                                var row = new Dictionary<string, object>
-                                {
-                                    { "指标", post.Key.TypeName },
-                                    { "分值", ValueFormating(fz, gs.Format) },
-                                    { "说明", gs.Remark },
-                                };
-                                items.Add(row);
-                            }
+                                { "指标", post.Key.TypeName },
+                                { "分值", ValueFormating(fz, gs.Format) },
+                                { "说明", gs.Remark },
+                            };
+                            items.Add(row);
                         }
                         DeleteBlankColumn(items);
                         var amount = basicData?.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0;
@@ -572,6 +574,7 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
                 {
                     item.Id = SnowFlake.GetInstance().GetLongId().ToString();
                     item.ParentId = detail.Id;
+                    item.Display = UniteDept.DisplayRule.始终显示.ToString();
                 }
 
                 var cfg = enumItems.FirstOrDefault(w => w.Name == detail.Title);