if判断条件修改

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -713,6 +713,13 @@
             原始数据修改
             </summary>
         </member>
+        <member name="M:Performance.Api.Controllers.OriginalController.FactorEdit(Performance.DtoModels.OriginalRequest)">
+            <summary>
+            修改factor数据
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.OriginalController.HeaderEdit(Performance.DtoModels.OriginalRequest)">
             <summary>
             修改header数据

performance/Performance.Services/OriginalService.cs

@@ -46,7 +46,7 @@ public bool EditFactorData(int userId, OriginalRequest request)
             var updateData = allData.Where(t => t.UnitType == basic.UnitType);
             var data = updateData.Where(t => t.TypeName == request.Cell.FieldName).ToList();
             // 修改同一类型下的系数
-            var factor = ConvertHelper.To<decimal>(request.Cell.CellValue);
+            var factor = ConvertHelper.To<decimal>(request.Cell.CellValue); // 系数
             if (data != null && data.Any())
             {
                 data.ForEach(t =>
@@ -61,8 +61,8 @@ public bool EditFactorData(int userId, OriginalRequest request)
 
         public bool EditHeaderData(int userId, OriginalRequest request)
         {
-            var filters = new List<string> { "核算单元（医技组）", "核算单元（医生组）", "核算单元（护理组）", "科室名称", "核算单元", "核算单元类型", "" };
-            if (!filters.Contains(request.Cell.FieldName))
+            var filters = new List<string> { "核算单元（医技组）", "核算单元（医生组）", "核算单元（护理组）", "科室名称", "核算单元", "核算单元类型" };
+            if (filters.Contains(request.Cell.FieldName))
                 throw new PerformanceException("该单元格暂不支持修改");
 
             var data = imheaderRepository.GetEntity(t => t.ID == request.Cell.Id);

performance/Performance.Services/SheetSevice.cs

@@ -171,7 +171,7 @@ private void CommonExport(int sheetID, SheetExportResponse response)
             response.Header.Add(rowhead);
             foreach (var header in headList.Where(t => !t.ParentID.HasValue || t.ParentID.Value == 0))
             {
-                rowhead.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false, id: header.ID));
+                rowhead.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false, id: header.ID, fieldName: header.CellValue));
             }
             if (headList.Any(t => t.ParentID.HasValue && t.ParentID.Value > 0))
             {
@@ -179,7 +179,7 @@ private void CommonExport(int sheetID, SheetExportResponse response)
                 response.Header.Add(rowhead2);
                 foreach (var header in headList.Where(t => t.ParentID.HasValue && t.ParentID.Value > 0))
                 {
-                    rowhead2.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false));
+                    rowhead2.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false, id: header.ID, fieldName: header.CellValue));
                 }
             }
             List<im_header> headers = new List<im_header>();