科室详情调整

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

@@ -766,7 +766,7 @@
             <summary> 行政后勤 </summary>
         </member>
         <member name="F:Performance.DtoModels.SheetType.AccountScoreAverage">
-            <summary> 科室材料考核 </summary>
+            <summary> 科室考核 </summary>
         </member>
         <member name="F:Performance.DtoModels.SheetType.AccountAdjustLaterOtherFee">
             <summary> 科室调节后其他绩效 </summary>

performance/Performance.Services/ComputeService.cs

@@ -740,9 +740,9 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
             var sheetType = new List<int>
             {
-                (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.AccountExtra,
+                (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload,
                 (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountScoreAverage,
-                (int)SheetType.AccountAdjustLaterOtherFee,(int)SheetType.AccountScoreAverage, (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee
+                (int)SheetType.AccountAdjustLaterOtherFee, (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee
             };
 
             int groupbasis = 1; string single = "";
@@ -755,7 +755,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                         groupbasis += 1;
                     single = sheet.SheetName.Substring(0, 3);
 
-                    var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
+                    var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "").Replace("科室绩效", "").Replace("科室", "");
                     var (sheettype, amount) = ClinicDepartmentDetail(persheet, account, basicData, sheet, type, sheetName);
                     (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, type, sheettype, amount);
                     var items = CommonDetailItems(basicData, headers, sheet, type);
@@ -1051,7 +1051,7 @@ public DeptDataDetails DeptOfficeDetail(int accountId)
                     var (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, UnitType.行政后勤);
                     var items = CommonDetailItems(basicData, headers, sheet, UnitType.行政后勤);
 
-                    var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
+                    var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "").Replace("科室绩效", "").Replace("科室", "");
                     var item = new DetailDtos { ItemName = sheetName, IncomeType = sheettype, OriginalType = sheet.SheetType ?? 0, Amount = amount, GroupBasis = groupBasis, Items = items };
                     deptDetails.Detail.Add(item);
                 }
@@ -1122,7 +1122,7 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
             var sheetType = new List<int>
             {
                 (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess,
-                (int)SheetType.AccountScoreAverage, (int)SheetType.AccountAdjustLaterOtherFee,(int)SheetType.AccountScoreAverage,
+                (int)SheetType.AccountScoreAverage, (int)SheetType.AccountAdjustLaterOtherFee,
                 (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee,
             };
 
@@ -1135,7 +1135,7 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     var (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, UnitType.特殊核算组);
                     var items = CommonDetailItems(basicData, headers, sheet, UnitType.特殊核算组);
 
-                    var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
+                    var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "").Replace("科室绩效", "").Replace("科室", "");
                     var item = new DetailDtos { ItemName = sheetName, IncomeType = sheettype, OriginalType = sheet.SheetType ?? 0, Amount = amount, GroupBasis = groupBasis, Items = items };
                     deptDetails.Detail.Add(item);
                 }

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

@@ -51,7 +51,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
                 AddNewSpecialConfig(sheet, style, specials, needMergedRegions, columns, dataFirstRowNum);
                 AddMergedRegion(sheet, needMergedRegions, columns);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }