Commit 90822afd by Licx

1.其他绩效校验数据文案修改

2.其他绩效添加数据,根据工号、医生姓名同时判断
3.新增绩效复制数据时,复制备用字段信息
parent 333b2402
...@@ -356,7 +356,7 @@ public ApiResponse GenerateReport([CustomizeValidator(RuleSet = "Delete"), FromB ...@@ -356,7 +356,7 @@ public ApiResponse GenerateReport([CustomizeValidator(RuleSet = "Delete"), FromB
public ApiResponse AccountingVerify([FromRoute] int allotId) public ApiResponse AccountingVerify([FromRoute] int allotId)
{ {
_allotService.AccoungtingVerify(allotId); _allotService.AccoungtingVerify(allotId);
return new ApiResponse(ResponseType.OK, "核算单元及组别数据验证结束,请刷新页面。"); return new ApiResponse(ResponseType.OK, "数据验证结束,请刷新页面。");
} }
/* /*
......
...@@ -482,9 +482,9 @@ public bool InsertApr(per_apr_amount request, int userId) ...@@ -482,9 +482,9 @@ public bool InsertApr(per_apr_amount request, int userId)
if (string.IsNullOrEmpty(request.PerforType) && request.Amount != 0) if (string.IsNullOrEmpty(request.PerforType) && request.Amount != 0)
throw new PerformanceException("文件中存在“绩效类型”为空的数据"); throw new PerformanceException("文件中存在“绩效类型”为空的数据");
var employee = peremployeeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PersonnelNumber == request.PersonnelNumber); var employee = peremployeeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PersonnelNumber == request.PersonnelNumber && t.DoctorName == request.DoctorName);
if (employee == null) if (employee == null)
throw new PerformanceException("工号在字典中不存在"); throw new PerformanceException("工号或姓名信息错误");
request.TypeInDepartment = GetTypeInDepartment(userId); request.TypeInDepartment = GetTypeInDepartment(userId);
request.Status = 1; request.Status = 1;
...@@ -502,14 +502,18 @@ public bool UpdateApr(per_apr_amount request) ...@@ -502,14 +502,18 @@ public bool UpdateApr(per_apr_amount request)
throw new PerformanceException("无效数据"); throw new PerformanceException("无效数据");
if (string.IsNullOrEmpty(request.PersonnelNumber)) if (string.IsNullOrEmpty(request.PersonnelNumber))
throw new PerformanceException("文件中存在“工号”为空的数据"); throw new PerformanceException("“工号”不能为空");
if (string.IsNullOrEmpty(request.PerforType) && request.Amount != 0) if (string.IsNullOrEmpty(request.PerforType) && request.Amount != 0)
throw new PerformanceException("文件中存在“绩效类型”为空的数据"); throw new PerformanceException("“绩效类型”不能为空");
var data = perapramountRepository.GetEntity(t => t.Id == request.Id); var data = perapramountRepository.GetEntity(t => t.Id == request.Id);
if (data == null) if (data == null)
throw new PerformanceException("修改数据无效"); throw new PerformanceException("修改数据无效");
var employee = peremployeeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PersonnelNumber == request.PersonnelNumber && t.DoctorName == request.DoctorName);
if (employee == null)
throw new PerformanceException("工号或姓名信息错误");
data.Status = 1; data.Status = 1;
data.PersonnelNumber = request.PersonnelNumber; data.PersonnelNumber = request.PersonnelNumber;
data.DoctorName = request.DoctorName; data.DoctorName = request.DoctorName;
......
...@@ -132,7 +132,17 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1 ...@@ -132,7 +132,17 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1
Remark = t.Remark, Remark = t.Remark,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
PersonnelNumber = t.PersonnelNumber, PersonnelNumber = t.PersonnelNumber,
JobNumber = t.JobNumber JobNumber = t.JobNumber,
Reserve01 = t.Reserve01,
Reserve02 = t.Reserve02,
Reserve03 = t.Reserve03,
Reserve04 = t.Reserve04,
Reserve05 = t.Reserve05,
Reserve06 = t.Reserve06,
Reserve07 = t.Reserve07,
Reserve08 = t.Reserve08,
Reserve09 = t.Reserve09,
Reserve10 = t.Reserve10,
}; };
string number = !string.IsNullOrEmpty(t.PersonnelNumber) ? t.PersonnelNumber : t.JobNumber; string number = !string.IsNullOrEmpty(t.PersonnelNumber) ? t.PersonnelNumber : t.JobNumber;
entity.PersonnelNumber = number; entity.PersonnelNumber = number;
......
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