Commit 09049971 by 799284587@qq.com

科室经济核算表展示调整

parent 317f4b39
......@@ -155,7 +155,7 @@ public PerSheet OnceCompute(PerSheet sheet)
if (header.IsHasChildren)
{
var maxcell = header.Children.Max(t => t.PointCell);
var parentHead = new PerHeader(0, maxcell + 1, $" {header.CellValue}合计", 0, 1, 2, new List<PerHeader>(), 1);
var parentHead = new PerHeader(0, maxcell + 1, $" {header.CellValue}合计", 0, 1, 3, new List<PerHeader>(), 1);
perHeadList.Add(parentHead);
var typeClass = dataList.Where(t => header.Children.Select(s => s.CellValue).Contains(t.TypeName));
......@@ -165,7 +165,7 @@ public PerSheet OnceCompute(PerSheet sheet)
pointcell++;
var childHead = new PerHeader(1, maxcell + pointcell, group.Key, 1, 1, 1, null, 1);
parentHead.Children.Add(childHead);
var ds = group.Where(t => t.CellValue.HasValue )
var ds = group.Where(t => t.CellValue.HasValue)
.GroupBy(t => t.AccountingUnit).Select(t => new PerData
{
UnitType = group.Key,
......@@ -199,15 +199,15 @@ public PerSheet OnceCompute(PerSheet sheet)
//获取最大列坐标位置
var maxhead = sheet.PerHeader.OrderByDescending(t => t.PointCell).FirstOrDefault();
int thiscell = maxhead.Children != null && maxhead.Children.Count > 0
? maxhead.Children.Max(t => t.PointCell) + 1
? maxhead.Children.Max(t => t.PointCell) + 3
: maxhead.PointCell;
PerHeader perHead = new PerHeader(0, thiscell, "科室可核算业绩收入", 0, 1, 2, new List<PerHeader>(), 1);
PerHeader perHead = new PerHeader(0, thiscell, "科室可核算业绩收入", 0, 1, 3, new List<PerHeader>(), 1);
var dataList = sheet.PerData.Select(t => (PerData)t);
List<PerData> perDataList = new List<PerData>();
//插入合计结果
var groupList = dataList.Where(t => t.IsTotal == 1 && t.CellValue.HasValue ).GroupBy(t => t.UnitType);
var groupList = dataList.Where(t => t.IsTotal == 1 && t.CellValue.HasValue).GroupBy(t => t.UnitType);
foreach (var group in groupList)
{
var childHead = new PerHeader(1, thiscell, group.Key, 1, 1, 1, null, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment