Merge branch 'feature/管理绩效数据展示' into develop

performance/Performance.Services/SecondAllotService.cs

@@ -2416,8 +2416,10 @@ public List<DeptDataDetails> DeptComputeDetailList(int userId, int allotId, out
                 { (int)Role.特殊科室, new List<string> { AccountUnitType.科主任.ToString() , AccountUnitType.护士长.ToString() } },
             };
 
+            int roleType = userInfo?.URole.Type ?? 0;
+            var accountTypes = userInfo != null && dict.ContainsKey(roleType) ? dict[roleType] : new List<string>();
 
-            var computes = rescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == accountingUnit && unitTypes.Contains(t.UnitType));
+            var computes = rescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == accountingUnit && (unitTypes.Contains(t.UnitType) || accountTypes.Contains(t.AccountType)));
             if (computes == null || !computes.Any()) return new List<DeptDataDetails>();
             foreach (var item in computes)
             {
@@ -2505,7 +2507,7 @@ private List<SecondPerforResponse> GetAllotPerformance(int allotId, List<res_com
         public ApiResponse Import(IFormCollection form)
         {
             var secondid = form.ToDictionary().GetValue("secondid", 0);
-            
+
             var agsecondallot = agsecondallotRepository.GetEntity(t => t.Id == secondid);
             if (agsecondallot == null)
                 return new ApiResponse(ResponseType.Fail, "secondid不存在");