Commit 65d97d24 by wyc

手工录入数据条件修改

parent 737fb0d6
...@@ -1980,19 +1980,19 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather) ...@@ -1980,19 +1980,19 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather)
{ "错误原因", $"人员字典中不存在工号[{newGather[i].PersonnelNumber}]" }, { "错误原因", $"人员字典中不存在工号[{newGather[i].PersonnelNumber}]" },
}); });
var ExistNameData = employees.FirstOrDefault(w => w.AllotId == allotId && (w.DoctorName != null && w.DoctorName == newGather[i].DoctorName)); //var ExistNameData = employees.FirstOrDefault(w => w.AllotId == allotId && (w.DoctorName != null && w.DoctorName == newGather[i].DoctorName));
if ((ExistNumberData == null || ExistNumberData.DoctorName != newGather[i].DoctorName) //if ((ExistNumberData == null || ExistNumberData.DoctorName != newGather[i].DoctorName)
|| (ExistNameData == null || ExistNameData.PersonnelNumber != newGather[i].PersonnelNumber)) //|| (ExistNameData == null || ExistNameData.PersonnelNumber != newGather[i].PersonnelNumber))
error.Add(new Dictionary<string, string> // error.Add(new Dictionary<string, string>
{ //{
{ "行号", $"第{i+1}行" }, // { "行号", $"第{i+1}行" },
{ "科室", newGather[i].Department??"" }, // { "科室", newGather[i].Department??"" },
{ "医生姓名", newGather[i].DoctorName??"" }, // { "医生姓名", newGather[i].DoctorName??"" },
{ "人员工号", newGather[i].PersonnelNumber??"" }, // { "人员工号", newGather[i].PersonnelNumber??"" },
{ "数值", newGather[i].Fee.ToString() }, // { "数值", newGather[i].Fee.ToString() },
{ "来源", "粘贴数据" }, // { "来源", "粘贴数据" },
{ "错误原因", $"该人员姓名和工号与人员字典中不匹配" }, // { "错误原因", $"该人员姓名和工号与人员字典中不匹配" },
}); //});
} }
//if (accountingUnit.Login != "admin") //if (accountingUnit.Login != "admin")
......
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