添加sheet和列，生成绩效与原始数据展示

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadEmployee.cs

@@ -27,7 +27,6 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
             string[] headers = new string[]
             {
                 "核算单元",
-                "核算单元",
                 "人员工号",
                 "医生姓名",
                 "职务分类",

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadExpend.cs

@@ -17,29 +17,29 @@ public class PerSheetDataReadExpend : IPerSheetDataRead
         {
             HeaderFirstRowNum = 4,
             HeaderLastRowNum = 4,
-            HeaderFirstCellNum = 0,
+            HeaderFirstCellNum = 3,
             DataFirstRowNum = 5,
             AccountingUnit = new List<AccountingUnit>
             {
                  new AccountingUnit
                  {
-                     AccountingUnitCellNum = 0,
+                     AccountingUnitCellNum = 3,
                      UnitType = "医技组",
-                     DeptCellNum = 3,
+                     DeptCellNum = 6,
                      FactorRow = 3,
                  },
                  new AccountingUnit
                  {
-                     AccountingUnitCellNum = 1,
+                     AccountingUnitCellNum = 4,
                      UnitType = "医生组",
-                     DeptCellNum = 3,
+                     DeptCellNum = 6,
                      FactorRow = 2,
                  },
                  new AccountingUnit
                  {
-                     AccountingUnitCellNum = 2,
+                     AccountingUnitCellNum = 5,
                      UnitType = "护理组",
-                     DeptCellNum = 3,
+                     DeptCellNum = 6,
                      FactorRow = 1,
                  },
             }

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadIncome.cs

@@ -17,32 +17,32 @@ public class PerSheetDataReadIncome : IPerSheetDataRead
         {
             HeaderFirstRowNum = 4,
             HeaderLastRowNum = 4,
-            HeaderFirstCellNum = 0,
+            HeaderFirstCellNum = 3,
             DataFirstRowNum = 5,
             AccountingUnit = new List<AccountingUnit>
             {
                 //核算单元（医技组）
                 new AccountingUnit
                 {
-                    AccountingUnitCellNum = 0,
+                    AccountingUnitCellNum = 3,
                     UnitType = "医技组",
-                    DeptCellNum = 3,
+                    DeptCellNum = 6,
                     FactorRow = 3,
                 },
                 //核算单元（医生组）
                 new AccountingUnit
                 {
-                    AccountingUnitCellNum = 1,
+                    AccountingUnitCellNum = 4,
                     UnitType = "医生组",
-                    DeptCellNum = 3,
+                    DeptCellNum = 6,
                     FactorRow = 2,
                 },
                 //核算单元（护理组）
                 new AccountingUnit
                 {
-                    AccountingUnitCellNum = 2,
+                    AccountingUnitCellNum = 5,
                     UnitType = "护理组",
-                    DeptCellNum = 3,
+                    DeptCellNum = 6,
                     FactorRow = 1,
                 }
             }

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadOtherIncome.cs

@@ -17,32 +17,32 @@ public class PerSheetDataReadOtherIncome : IPerSheetDataRead
         {
             HeaderFirstRowNum = 4,
             HeaderLastRowNum = 4,
-            HeaderFirstCellNum = 0,
+            HeaderFirstCellNum = 3,
             DataFirstRowNum = 5,
             AccountingUnit = new List<AccountingUnit>
             {
                 //核算单元（医技组）
                 new AccountingUnit
                 {
-                    AccountingUnitCellNum = 0,
+                    AccountingUnitCellNum = 3,
                     UnitType = "医技组",
-                    DeptCellNum = 3,
+                    DeptCellNum = 6,
                     FactorRow = 3,
                 },
                 //核算单元（医生组）
                 new AccountingUnit
                 {
-                    AccountingUnitCellNum = 1,
+                    AccountingUnitCellNum = 4,
                     UnitType = "医生组",
-                    DeptCellNum = 3,
+                    DeptCellNum = 6,
                     FactorRow = 2,
                 },
                 //核算单元（护理组）
                 new AccountingUnit
                 {
-                    AccountingUnitCellNum = 2,
+                    AccountingUnitCellNum = 5,
                     UnitType = "护理组",
-                    DeptCellNum = 3,
+                    DeptCellNum = 6,
                     FactorRow = 1,
                 }
             }

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadWorkload.cs

@@ -17,14 +17,14 @@ public class PerSheetDataReadWorkload : IPerSheetDataRead
         {
             HeaderFirstRowNum = 1,
             HeaderLastRowNum = 1,
-            HeaderFirstCellNum = 0,
+            HeaderFirstCellNum = 1,
             DataFirstRowNum = 3,
             AccountingUnit = new List<AccountingUnit>
             {
                new AccountingUnit
                {
-                    AccountingUnitCellNum = 0,
-                    DeptCellNum = 1,
+                    AccountingUnitCellNum = 1,
+                    DeptCellNum = 2,
                     FactorRow = 2
                }
             }

performance/Performance.Services/SheetSevice.cs

@@ -107,6 +107,25 @@ public SheetExportResponse SheetExport(int sheetID)
             else
             {
                 CommonExport(sheetID, response);
+                if (new int[] { (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload }.Contains(sheet.SheetType.Value))
+                {
+                    var point = 0;
+                    if (new int[] { (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend }.Contains(sheet.SheetType.Value))
+                        point = -3;
+                    else
+                        point = -1;
+
+                    response.Header.ForEach(t => t.Data.ForEach(data =>
+                    {
+                        if (data.PointCell != 0)
+                            data.PointCell += point;
+                    }));
+                    response.Row.ForEach(t => t.Data.ForEach(data =>
+                    {
+                        if (data.PointCell != 0)
+                            data.PointCell += point;
+                    }));
+                }
             }
 
             if (response.Row != null && response.Row.Any())