Merge remote-tracking branch 'origin/v2020calculate' into v2020calculate

performance/Performance.Services/DFExtractService.cs

@@ -1679,7 +1679,6 @@ private void WriteSheetData(ISheet sheet, IPerSheetDataRead sheetRead, List<NewE
                         var department = row.GetCell(6)?.ToString();    // 科室名称
                         if (string.IsNullOrEmpty(department)) continue;
 
-                        lastrownumber = rowIndex;
                         var deptData = allExtract.Where(t => t.Department == department);
                         if (deptData == null || !deptData.Any()) continue;
 
@@ -1705,6 +1704,7 @@ private void WriteSheetData(ISheet sheet, IPerSheetDataRead sheetRead, List<NewE
                             }
                         }
                         allExtract.RemoveAll(t => t.Department == department);
+                        if (i > lastrownumber) lastrownumber = i;
                     }
                 }
                 #endregion
@@ -1848,7 +1848,6 @@ private void WriteWorkData(ISheet sheet, IPerSheetDataRead sheetRead, List<NewEx
                         var department = row.GetCell(2)?.ToString();    // 科室名称
                         if (string.IsNullOrEmpty(department)) continue;
 
-                        lastrownumber++;
                         var deptData = allExtract.Where(t => t.Department == department);
                         if (deptData == null || !deptData.Any()) continue;
 
@@ -1868,6 +1867,7 @@ private void WriteWorkData(ISheet sheet, IPerSheetDataRead sheetRead, List<NewEx
                             }
                         }
                         allExtract.RemoveAll(t => t.Department == department);
+                        if (i > lastrownumber) lastrownumber = i;
                     }
                 }
                 #endregion
@@ -1881,7 +1881,7 @@ private void WriteWorkData(ISheet sheet, IPerSheetDataRead sheetRead, List<NewEx
             var lastrowIndex = isNewTemp ? rowIndex : lastrownumber + 1;
             foreach (var department in allExtract.Select(t => t.Department).Where(t => !string.IsNullOrEmpty(t)).Distinct())
             {
-                var row = sheet.CreateRow(lastrowIndex);
+                var row = GetOrCreate(sheet, lastrowIndex);
                 for (int i = head.FirstCellNum + 1; i < head.LastCellNum; i++)
                 {
                     var headName = head.GetCell(i).StringCellValue;