二次绩效增加字段 是否显示公式

performance/Performance.Api/Controllers/AccountController.cs

@@ -26,6 +26,7 @@ public class AccountController : Controller
         private Application _options;
         private ClaimService _claim;
         private HospitalService _hospitalService;
+
         public AccountController(UserService userService,
             HospitalService hospitalService,
             RoleService roleService,
@@ -58,7 +59,7 @@ public class AccountController : Controller
         ///
         /// </remarks>
         /// <param name="request"></param>
-        /// <returns></returns> 
+        /// <returns></returns>
         [HttpPost]
         [Route("login")]
         [AllowAnonymous]
@@ -86,7 +87,7 @@ public ApiResponse<JwtToken> Login([FromBody] LoginRequest request)
         /// <summary>
         /// 刷新登录JWT TOKEN
         /// </summary>
-        /// <returns></returns> 
+        /// <returns></returns>
         [HttpPost]
         [Route("refresh")]
         public ApiResponse<JwtToken> Refresh()
@@ -110,6 +111,7 @@ public ApiResponse<JwtToken> Refresh()
 
             return new ApiResponse<JwtToken>(ResponseType.OK, jwtToken);
         }
+
         /// <summary>
         /// 查询个人信息
         /// </summary>
@@ -296,4 +298,4 @@ public ApiResponse<UserResponse> Password(int userId)
             return new ApiResponse<UserResponse>(ResponseType.OK, user);
         }
     }
-}
+}
\ No newline at end of file

performance/Performance.DtoModels/Response/SecondListResponse.cs

@@ -11,10 +11,15 @@ public class SecondListResponse : ag_secondallot
         public int IsArchive { get; set; }
 
         /// <summary>
-        /// 0 数据未上传 1 数据已上传 2 正在校验数据 3 数据验证通过 
-        /// 4 数据错误 5 正在生成绩效 6 下发绩效 7 绩效解析失败 
+        /// 0 数据未上传 1 数据已上传 2 正在校验数据 3 数据验证通过
+        /// 4 数据错误 5 正在生成绩效 6 下发绩效 7 绩效解析失败
         /// 8 归档 9 等待生成 10 绩效结果解析成功
         /// </summary>
         public int States { get; set; }
+
+        /// <summary>
+        /// 0 不显示 1 显示
+        /// </summary>
+        public int ShowFormula { get; set; }
     }
-}
+}
\ No newline at end of file

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -94,9 +94,11 @@ public List<ex_result> Handler(int hospitalId, per_allot allot, string groupName
                             case ExDataDict.ExModule:
                                 data.AddRange(ExtractModuleData(allot, groupName, isSingle, scripts, configs, pair.Value));
                                 break;
+
                             case ExDataDict.ExItem:
                                 data.AddRange(ExtractItemData(allot, groupName, isSingle, scripts, configs, allmodules, pair.Value));
                                 break;
+
                             case ExDataDict.ExSpecial:
                                 data.AddRange(ExtractSpecialData(allot, groupName, isSingle, scripts, configs, pair.Value));
                                 break;
@@ -352,7 +354,7 @@ private List<ex_result> ExtractSpecialData(per_allot allot, string groupName, bo
             return data;
         }
 
-        #endregion
+        #endregion ExResultData
 
         #region QueryData
 
@@ -400,6 +402,6 @@ private IEnumerable<ExtractDto> QueryData(sys_hospitalconfig config, per_allot a
             return pairs;
         }
 
-        #endregion
+        #endregion QueryData
     }
-}
+}
\ No newline at end of file

performance/Performance.Services/SecondAllotService.cs

@@ -89,6 +89,7 @@ public class SecondAllotService : IAutoInjection
         }
 
         #region 二次绩效列表与数据保存
+
         /// <summary>
         /// 获取二次绩效列表
         /// </summary>
@@ -123,9 +124,13 @@ public List<SecondListResponse> GetSecondList(int userId)
             var list = Mapper.Map<List<SecondListResponse>>(secondList);
             list?.ForEach(t =>
             {
-                var states = allotList.FirstOrDefault(a => a.ID == t.AllotId).States;
-                t.IsArchive = states == 8 ? 1 : 0;
-                t.States = states;
+                var allot = allotList.FirstOrDefault(a => a.ID == t.AllotId);
+                if (allot != null)
+                {
+                    t.IsArchive = allot.States == 8 ? 1 : 0;
+                    t.States = allot.States;
+                    t.ShowFormula = allot.ShowFormula;
+                }
             });
             return list;
         }
@@ -234,7 +239,7 @@ public List<SecondListResponse> GetSecondList(int userId)
         //    return others;
         //}
 
-        #endregion
+        #endregion 二次绩效详情
 
         /// <summary>
         /// 二次绩效分配录入人员自动补全信息
@@ -267,6 +272,7 @@ public List<BodyItem> AutoComplete(SecondEmpRequest request, int userId)
         }
 
         #region 二次绩效详情-使用中
+
         /// <summary>
         /// 二次绩效详情
         /// </summary>
@@ -279,7 +285,6 @@ public SecondResponse GetSecondDetail(UseTempRequest request, int userId)
             if (usetemp == null)
                 throw new PerformanceException("当前科室暂未配置绩效模板");
 
-
             var temp = perforAgtempRepository.GetEntity(t => t.Id == usetemp.UseTempId);
             if (temp == null || temp.IsEnable != 1)
                 throw new PerformanceException("模板无效，请重新选择");
@@ -343,6 +348,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request, int userId)
                 BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ThenBy(t => t.Type).ThenBy(t => t.Sort).ToList(),
             };
         }
+
         /// <summary>
         /// 补充 医院其他绩效
         /// </summary>
@@ -644,7 +650,8 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
                 }
             }
         }
-        #endregion
+
+        #endregion 二次绩效详情-使用中
 
         /// <summary>
         /// 二次绩效项录入保存
@@ -763,9 +770,11 @@ public bool SaveCompute(List<ag_compute> request)
             }
             return true;
         }
-        #endregion
+
+        #endregion 二次绩效列表与数据保存
 
         #region 模板
+
         /// <summary>
         /// 获取模板列表
         /// </summary>
@@ -840,6 +849,7 @@ public bool UseTemp(UseTempRequest request)
                     var fixatList = perforAgfixatitemRepository.GetEntities(t => secondId.Contains(t.SecondId.Value));
 
                     #region 获取需要添加的数据 和 无需操作的数据
+
                     //var update_second_usetemps = new List<ag_secondallot>();
                     foreach (var second in secondList)
                     {
@@ -873,11 +883,12 @@ public bool UseTemp(UseTempRequest request)
                                         : configs.FirstOrDefault(t => t.TypeName == head.FiledName)?.Value.ToString()
                                     });
                                 }
-
                             }
                         }
                     }
-                    #endregion
+
+                    #endregion 获取需要添加的数据 和 无需操作的数据
+
                     //perforAgsecondallotRepository.UpdateRange(update_second_usetemps.ToArray());
                     if (list != null && list.Count > 0)
                     {
@@ -944,9 +955,11 @@ public void RefreshTemp(UseTempRequest request)
             if (addItems != null && addItems.Count() > 0)
                 perforAgfixatitemRepository.AddRange(addItems.ToArray());
         }
-        #endregion
+
+        #endregion 模板
 
         #region 工作量绩效配置
+
         /// <summary>
         /// 获取工作量列表
         /// </summary>
@@ -1125,9 +1138,11 @@ public bool DeleteWorkType(WorkloadRequest request)
             else
                 return ("", user.Department);
         }
-        #endregion
+
+        #endregion 工作量绩效配置
 
         #region 二次绩效考核
+
         /// <summary>
         /// 二次绩效考核列表
         /// </summary>
@@ -1356,7 +1371,8 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
                 perforAgcomputeRepository.AddRange(computes.ToArray());
             }
 
-            #endregion
+            #endregion 添加至二次绩效汇总
+
             return result;
         }
 
@@ -1388,9 +1404,11 @@ public bool NursingDeptAudit(int userId, SecondAuditRequest request)
 
             return perforAgsecondallotRepository.Update(second);
         }
-        #endregion
+
+        #endregion 二次绩效考核
 
         #region common
+
         /// <summary>
         /// 获取二次绩效
         /// </summary>
@@ -1466,9 +1484,11 @@ public List<BodyItem> GetBodyItems(List<HeadItem> headItems, int source, List<co
             }
             return bodyItems;
         }
-        #endregion
+
+        #endregion common
 
         #region 二次绩效其他来源
+
         public List<ag_othersource> OtherList(int secondId, int userId)
         {
             var second = perforAgsecondallotRepository.GetEntity(t => t.Id == secondId);
@@ -1636,9 +1656,11 @@ public List<ag_othersource> OtherSave(int secondId, List<ag_othersource> request
             }
             return perforAgothersourceRepository.GetEntities(t => t.SecondId == secondId);
         }
-        #endregion
+
+        #endregion 二次绩效其他来源
 
         #region 打印
+
         public List<SecPrintResponse> Print(int secondId)
         {
             var second = perforAgsecondallotRepository.GetEntity(t => t.Id == secondId);
@@ -1690,7 +1712,8 @@ public List<SecPrintResponse> Print(int secondId)
                 return result.OrderBy(t => t.RowNumber).ToList();
             }
         }
-        #endregion
+
+        #endregion 打印
 
         public List<SecondPerforResponse> DeptComputeDetail(int userId, int allotId)
         {
@@ -1716,4 +1739,4 @@ public List<SecondPerforResponse> DeptComputeDetail(int userId, int allotId)
             return Mapper.Map<List<SecondPerforResponse>>(data);
         }
     }
-}
+}
\ No newline at end of file

performance/Performance.Services/UserService.cs

@@ -30,6 +30,7 @@ public class UserService : IAutoInjection
         private PerforResaccountRepository _resaccountRepository;
         private PerforPerallotRepository _perallotRepository;
         private PerforPerdeptdicRepository _perdeptdicRepository;
+
         public UserService(IOptions<Application> application,
             PerforSmsRepository smsRepository,
             PerforUserRepository userRepository,
@@ -283,7 +284,6 @@ public UserResponse Update(UserRequest request, bool isAgainAdmin)
             return Mapper.Map<UserResponse>(user);
         }
 
-
         /// <summary>
         /// 修改个人信息
         /// </summary>
@@ -409,8 +409,6 @@ public List<TitleValue> Department(int hospitalId)
             return result?.Select(t => new TitleValue { Title = t, Value = t }).ToList();
         }
 
-
-
         /// <summary>
         /// 递归获取所有下属角色
         /// </summary>
@@ -481,4 +479,4 @@ public UserResponse ResetPwd(int userId, int loginUserId)
             return Mapper.Map<UserResponse>(user);
         }
     }
-}
+}
\ No newline at end of file