显示调整

parent 3be1cf6c
......@@ -438,6 +438,13 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.WorkHeader(Performance.DtoModels.WorkItemRequest)">
<summary>
获取工作量绩效列头
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
<summary>
获取人员列表
......
......@@ -83,6 +83,9 @@ private void SaveComputeAccount(PerSheet sheet, int allotId)
perforPerSheetRepository.Add(imsheet);
var dataList = sheet.PerData.Select(t => (PerDataAccountBaisc)t);
if (sheet.ModuleName == "医生组临床科室单元核算表")
dataList = dataList.Where(t => t.UnitType == UnitType.医生组.ToString()).ToList();
List<res_account> addList = new List<res_account>();
foreach (var data in dataList)
{
......@@ -151,7 +154,6 @@ public void Save(List<PerSheet> perSheets, int allotId)
logManageService.WriteMsg("正在生成绩效", $"保存核算数据 - {sheet.SheetName}", 1, allotId, "ReceiveMessage");
if (sheet.SheetType == SheetType.ComputeDoctorAccount || sheet.SheetType == SheetType.ComputeNurseAccount)
{
if (sheet.ModuleName != "专家核算表")
SaveComputeAccount(sheet, allotId);
}
else
......
......@@ -91,7 +91,7 @@ public List<res_specialunit> GetSpecial(int allotId)
/// <returns></returns>
public List<DeptResponse> GetDoctorPerformance(int allotId)
{
var list = perforResaccountRepository.GetEntities(t => t.UnitType != (int)UnitType.护理 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
var list = perforResaccountRepository.GetEntities(t => t.UnitType == (int)UnitType.医生 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
List<DeptResponse> doctor = Mapper.Map<List<DeptResponse>>(list);
doctor?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
return doctor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment