Commit da587975 by 1391696987

手工录入可跨科室录入

parent 500f9e47
...@@ -1592,7 +1592,7 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather) ...@@ -1592,7 +1592,7 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather)
{ "人员工号", newGather[i].PersonnelNumber??"" }, { "人员工号", newGather[i].PersonnelNumber??"" },
{ "数值", newGather[i].Fee.ToString() }, { "数值", newGather[i].Fee.ToString() },
{ "来源", "粘贴数据" }, { "来源", "粘贴数据" },
{ "错误原因", "关键信息缺失”请补全或删除" }, { "错误原因", "科室不能为空" },
}); });
if (newGather[i].Fee == 0) if (newGather[i].Fee == 0)
...@@ -1669,20 +1669,20 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather) ...@@ -1669,20 +1669,20 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather)
}); });
} }
if (accountingUnit.Login != "admin") //if (accountingUnit.Login != "admin")
{ //{
if (!hasDepartment.Contains(newGather[i].Department)) // if (!hasDepartment.Contains(newGather[i].Department))
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() },
{ "来源", "粘贴数据" }, // { "来源", "粘贴数据" },
{ "错误原因", $"[{newGather[i].Department}]科室不属于[{accountingUnit.Department}]核算单元,[{accountingUnit.Department}]核算单元有【{string.Join("】【", hasDepartment)}】科室" }, // { "错误原因", $"[{newGather[i].Department}]科室不属于[{accountingUnit.Department}]核算单元,[{accountingUnit.Department}]核算单元有【{string.Join("】【", hasDepartment)}】科室" },
}); // });
} //}
} }
if (error.Count > 0) if (error.Count > 0)
return new ApiResponse(ResponseType.WarningTable, "验证不通过,当前操作已拒绝", error); return new ApiResponse(ResponseType.WarningTable, "验证不通过,当前操作已拒绝", error);
......
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