Commit 5bdbb163 by lcx

医院其他绩效录入科室为登录人员的科室

parent d64ac647
...@@ -447,7 +447,7 @@ public ApiResponse Import([FromForm] IFormCollection form) ...@@ -447,7 +447,7 @@ public ApiResponse Import([FromForm] IFormCollection form)
[HttpPost("autocomplate")] [HttpPost("autocomplate")]
public ApiResponse<per_apr_amount> GetEmployeeMessage([FromBody] per_apr_amount request) public ApiResponse<per_apr_amount> GetEmployeeMessage([FromBody] per_apr_amount request)
{ {
var result = employeeService.GetEmployeeMessage(request.AllotId, request.PersonnelNumber); var result = employeeService.GetEmployeeMessage(request.AllotId, request.PersonnelNumber, claim.GetUserId());
return new ApiResponse<per_apr_amount>(ResponseType.OK, "人员信息", result); return new ApiResponse<per_apr_amount>(ResponseType.OK, "人员信息", result);
} }
......
...@@ -29,6 +29,7 @@ public class EmployeeService : IAutoInjection ...@@ -29,6 +29,7 @@ public class EmployeeService : IAutoInjection
private PerforImemployeelogisticsRepository perforImemployeelogisticsRepository; private PerforImemployeelogisticsRepository perforImemployeelogisticsRepository;
private PerforUserroleRepository userroleRepository; private PerforUserroleRepository userroleRepository;
private PerforPeremployeeRepository peremployeeRepository; private PerforPeremployeeRepository peremployeeRepository;
private PerforUserRepository userRepository;
private ILogger<EmployeeService> logger; private ILogger<EmployeeService> logger;
public EmployeeService(PerforImemployeeRepository perforImemployeeRepository, public EmployeeService(PerforImemployeeRepository perforImemployeeRepository,
...@@ -41,6 +42,7 @@ public class EmployeeService : IAutoInjection ...@@ -41,6 +42,7 @@ public class EmployeeService : IAutoInjection
PerforImemployeelogisticsRepository perforImemployeelogisticsRepository, PerforImemployeelogisticsRepository perforImemployeelogisticsRepository,
PerforUserroleRepository userroleRepository, PerforUserroleRepository userroleRepository,
PerforPeremployeeRepository peremployeeRepository, PerforPeremployeeRepository peremployeeRepository,
PerforUserRepository userRepository,
ILogger<EmployeeService> logger) ILogger<EmployeeService> logger)
{ {
this.perforImemployeeRepository = perforImemployeeRepository; this.perforImemployeeRepository = perforImemployeeRepository;
...@@ -53,6 +55,7 @@ public class EmployeeService : IAutoInjection ...@@ -53,6 +55,7 @@ public class EmployeeService : IAutoInjection
this.perforImemployeelogisticsRepository = perforImemployeelogisticsRepository; this.perforImemployeelogisticsRepository = perforImemployeelogisticsRepository;
this.userroleRepository = userroleRepository; this.userroleRepository = userroleRepository;
this.peremployeeRepository = peremployeeRepository; this.peremployeeRepository = peremployeeRepository;
this.userRepository = userRepository;
this.logger = logger; this.logger = logger;
} }
...@@ -578,10 +581,13 @@ public void ImpoerAprEmployees(int allotid, string path, int userid) ...@@ -578,10 +581,13 @@ public void ImpoerAprEmployees(int allotid, string path, int userid)
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="jobNumber"></param> /// <param name="jobNumber"></param>
/// <returns></returns> /// <returns></returns>
public per_apr_amount GetEmployeeMessage(int allotId, string jobNumber) public per_apr_amount GetEmployeeMessage(int allotId, string jobNumber, int userId)
{ {
if (string.IsNullOrEmpty(jobNumber)) return new per_apr_amount(); if (string.IsNullOrEmpty(jobNumber)) return new per_apr_amount();
var user = userRepository.GetEntity(w => w.ID == userId && w.IsDelete == 1);
if (user == null) throw new PerformanceException("操作用户不存在或用户信息错误!");
var employee = peremployeeRepository.GetEntity(w => w.AllotId == allotId && w.JobNumber.Trim() == jobNumber.Trim()); var employee = peremployeeRepository.GetEntity(w => w.AllotId == allotId && w.JobNumber.Trim() == jobNumber.Trim());
if (employee == null) return new per_apr_amount(); if (employee == null) return new per_apr_amount();
...@@ -590,7 +596,7 @@ public per_apr_amount GetEmployeeMessage(int allotId, string jobNumber) ...@@ -590,7 +596,7 @@ public per_apr_amount GetEmployeeMessage(int allotId, string jobNumber)
AllotId = allotId, AllotId = allotId,
PersonnelNumber = employee.JobNumber, PersonnelNumber = employee.JobNumber,
DoctorName = employee.DoctorName, DoctorName = employee.DoctorName,
TypeInDepartment = employee.Department, TypeInDepartment = user.Department,
AccountingUnit = employee.AccountingUnit AccountingUnit = employee.AccountingUnit
}; };
} }
......
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