Commit 76217558 by 钟博

修改导出excel版本,重新计算合计,人员字典单元格类型修改

parent d37d2479
...@@ -658,8 +658,11 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId) ...@@ -658,8 +658,11 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId)
var ss = deptdics?.Where(t => !new string[] { UnitType.专家组.ToString() }.Contains(t.UnitType)); var ss = deptdics?.Where(t => !new string[] { UnitType.专家组.ToString() }.Contains(t.UnitType));
if (result.Columns != null && result.Columns.Any()) if (result.Columns != null && result.Columns.Any())
{ {
var columns = new [] { "核算单元", "科室名称", "姓名", "员工工号" };
foreach (var column in result.Columns) foreach (var column in result.Columns)
{ {
if (columns.Contains(column.Data))
column.Type = "text";
if (column.Data == "人员类别") if (column.Data == "人员类别")
{ {
...@@ -772,7 +775,7 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request) ...@@ -772,7 +775,7 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
if (employees != null && employees.Any()) if (employees != null && employees.Any())
peremployeeRepository.AddRange(employees.ToArray()); peremployeeRepository.AddRange(employees.ToArray());
//个人绩效查询用户添加 //个人绩效查询用户添加
SaveQueryRole(HospitalId,request); SaveQueryRole(HospitalId, request);
return true; return true;
} }
......
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