绩效抽取特殊科室清除非公式数据、查询数据时共用同一条sql时，循环模块保存

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -250,7 +250,6 @@ private List<ex_result> ExtractItemData(per_allot allot, string groupName, bool
                 foreach (var typeId in typeIds)
                 {
                     var thisItems = items.Where(t => t.TypeId == typeId).ToList();
-                    var modulename = modules.FirstOrDefault(t => t.Id == thisItems.First().ModuleId)?.ModuleName;
 
                     ratio += 30m / typeIds.Count();
                     logService.ReturnTheLog(allot.ID, groupName, 3, "", ratio > 50 ? 50 : ratio, 1, isSingle);
@@ -266,6 +265,7 @@ private List<ex_result> ExtractItemData(per_allot allot, string groupName, bool
                         {
                             thisItems.ForEach(f =>
                             {
+                                var modulename = modules.FirstOrDefault(t => t.Id == f.ModuleId)?.ModuleName;
                                 var result = querydata.Select(t => new ex_result
                                 {
                                     Department = t.Department,
@@ -404,4 +404,4 @@ private IEnumerable<ExtractDto> QueryData(sys_hospitalconfig config, per_allot a
 
         #endregion QueryData
     }
-}
\ No newline at end of file
+}

performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs

@@ -87,7 +87,7 @@ private void ClearSheetPartialData(ISheet sheet, List<string> columns, int dataF
                 foreach (var cellIndex in dict)
                 {
                     var cell = row.GetCell(cellIndex);
-                    if (cell != null) row.RemoveCell(cell);
+                    if (cell != null && cell.CellType != CellType.Formula) row.RemoveCell(cell);
                 }
             }
         }