Commit 3198ed0d by 李承祥

工作量写入

parent e0b7db57
...@@ -303,7 +303,7 @@ private void WriteIncome(ISheet sheet, int allotLastId, IPerSheetDataRead sheetR ...@@ -303,7 +303,7 @@ private void WriteIncome(ISheet sheet, int allotLastId, IPerSheetDataRead sheetR
} }
else if (headName == "科室名称") else if (headName == "科室名称")
{ {
var dept = importData.FirstOrDefault(t => t.Department == department)?.Department; var dept = importData.FirstOrDefault(t => t.Department == department)?.Department ?? allExtract.FirstOrDefault(t => t.Department == department)?.Department;
newCell.SetCellValue(dept ?? ""); newCell.SetCellValue(dept ?? "");
} }
else else
...@@ -402,7 +402,7 @@ private void WriteWorkload(ISheet sheet, int allotLastId, IPerSheetDataRead shee ...@@ -402,7 +402,7 @@ private void WriteWorkload(ISheet sheet, int allotLastId, IPerSheetDataRead shee
} }
else if (headName == "科室名称") else if (headName == "科室名称")
{ {
var dept = importData.FirstOrDefault(t => t.Department == department)?.Department; var dept = importData.FirstOrDefault(t => t.Department == department)?.Department ?? allExtract.FirstOrDefault(t => t.Department == department)?.Department;
newCell.SetCellValue(dept ?? ""); newCell.SetCellValue(dept ?? "");
} }
else else
...@@ -412,6 +412,7 @@ private void WriteWorkload(ISheet sheet, int allotLastId, IPerSheetDataRead shee ...@@ -412,6 +412,7 @@ private void WriteWorkload(ISheet sheet, int allotLastId, IPerSheetDataRead shee
newCell.CellStyle = style; newCell.CellStyle = style;
} }
} }
rowIndex++;
} }
} }
......
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