临床科室医护绩效测算表 -- 写出数据时修改；核算单元修改

performance/Performance.Services/ExtractService.cs

@@ -292,8 +292,8 @@ private bool WriteExcel(string newpath, string originalPath, List<PerSheet> shee
                             var importRow = importSheet.CreateRow(maxHeaderRowNumber + i + 1);
                             Dictionary<string, Func<PerDataAccountBaisc, object>> keyValues = new Dictionary<string, Func<PerDataAccountBaisc, object>>
                             {
-                                { "核算单元", (t) => t.AccountingUnit },
-                                { "科室", (t) => t.Department },
+                                { "核算单元（医生组）", (t) => t.AccountingUnit },
+                                { "核算单元（护理组）", (t) => t.Department },
                                 { "医生组核算单元医生数量", (t) => t.DoctorNumber },
                                 { "医生组基础系数", (t) => t.DoctorBasicFactor },
                                 { "医生组倾斜系数", (t) => t.DoctorSlopeFactor },
@@ -318,6 +318,7 @@ private bool WriteExcel(string newpath, string originalPath, List<PerSheet> shee
                                 if (headInfo != null)
                                 {
                                     var value = (keyValues[item].Invoke(dataList[i]) ?? "").ToString();
+                                    if (value != "0")
                                         importRow.CreateCell(headInfo.PointCell).SetCellValue(Verify(value));
                                 }
                             }
@@ -606,8 +607,8 @@ public List<PerHeader> GetHeader(SheetType sheetType)
             {
                 header = new List<PerHeader>
                 {
-                    new PerHeader { CellValue = "核算单元", MergeCell = 1, MergeRow = 2, PointCell = 0, PointRow = 1 },
-                    new PerHeader { CellValue = "科室", MergeCell = 1, MergeRow = 2, PointCell = 1, PointRow = 1 },
+                    new PerHeader { CellValue = "核算单元（医生组）", MergeCell = 1, MergeRow = 2, PointCell = 0, PointRow = 1 },
+                    new PerHeader { CellValue = "核算单元（护理组）", MergeCell = 1, MergeRow = 2, PointCell = 1, PointRow = 1 },
                     new PerHeader { CellValue = "医生组", MergeCell = 8, MergeRow = 1, PointCell = 2, PointRow = 1,
                         Children = new List<PerHeader>{
                             new PerHeader { CellValue = "核算单元医生数量", MergeCell = 1, MergeRow = 1, PointCell = 2, PointRow = 2 },