diff --git a/PEIS/Model/StatisticalReportModel.cs b/PEIS/Model/StatisticalReportModel.cs index b5faa02..306320c 100644 --- a/PEIS/Model/StatisticalReportModel.cs +++ b/PEIS/Model/StatisticalReportModel.cs @@ -346,11 +346,8 @@ namespace PEIS.Model ? $@"SELECT a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, COUNT ( * ) AS Quantity, - SUM ( a.SettlePrice ) AS SettleFee, b.Discount, Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee FROM @@ -363,18 +360,15 @@ namespace PEIS.Model a.FeeItemCode, a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, - b.Discount ORDER BY a.FeeItemCode,a.DeptName,Fee" + b.Discount, + a.DeptCode + ORDER BY a.DeptCode,a.FeeItemCode" : $@"SELECT a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, COUNT ( * ) AS Quantity, - SUM ( a.SettlePrice ) AS SettleFee, b.Discount, Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee FROM @@ -388,10 +382,10 @@ namespace PEIS.Model a.FeeItemCode, a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, - b.Discount ORDER BY a.FeeItemCode,a.DeptName,Fee "; + b.Discount, + a.DeptCode + ORDER BY a.DeptCode,a.FeeItemCode"; } else if(status == 1) { @@ -399,11 +393,8 @@ namespace PEIS.Model ? $@"SELECT a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, COUNT ( * ) AS Quantity, - SUM ( a.SettlePrice ) AS SettleFee, b.Discount, Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee FROM @@ -416,18 +407,15 @@ namespace PEIS.Model a.FeeItemCode, a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, - b.Discount ORDER BY a.FeeItemCode,a.DeptName,Fee" + b.Discount, + a.DeptCode + ORDER BY a.DeptCode,a.FeeItemCode" : $@"SELECT a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, COUNT ( * ) AS Quantity, - SUM ( a.SettlePrice ) AS SettleFee, b.Discount, Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee FROM @@ -441,10 +429,10 @@ namespace PEIS.Model a.FeeItemCode, a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, - b.Discount ORDER BY a.FeeItemCode,a.DeptName,Fee "; + b.Discount, + a.DeptCode + ORDER BY a.DeptCode,a.FeeItemCode"; } else { @@ -452,11 +440,8 @@ namespace PEIS.Model ? $@"SELECT a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, COUNT ( * ) AS Quantity, - SUM ( a.SettlePrice ) AS SettleFee, b.Discount, Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee FROM @@ -469,18 +454,15 @@ namespace PEIS.Model a.FeeItemCode, a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, - b.Discount ORDER BY a.FeeItemCode,a.DeptName,Fee" + b.Discount, + a.DeptCode + ORDER BY a.DeptCode,a.FeeItemCode " : $@"SELECT a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, COUNT ( * ) AS Quantity, - SUM ( a.SettlePrice ) AS SettleFee, b.Discount, Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee FROM @@ -494,10 +476,10 @@ namespace PEIS.Model a.FeeItemCode, a.DeptName, a.FeeItemName, - a.Unit, - a.SettlePrice, a.Price, - b.Discount ORDER BY a.FeeItemCode,a.DeptName,Fee "; + b.Discount, + a.DeptCode + ORDER BY a.DeptCode,a.FeeItemCode "; } return DAOHelp.GetDataBySQL(sql); diff --git a/PEIS/ReportFiles/CostCount.frx b/PEIS/ReportFiles/CostCount.frx index f18f61a..933b944 100644 --- a/PEIS/ReportFiles/CostCount.frx +++ b/PEIS/ReportFiles/CostCount.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -30,34 +30,34 @@ namespace FastReport { DataSourceBase rowData = Report.GetDataSource("P"); - if(deptName.Equals(rowData["DeptName"].ToString())) - { - deptSum += Convert.ToDouble(rowData["SettleFee"].ToString()); - deptHisSum += Convert.ToDouble(rowData["Fee"].ToString()); - - Cell38.Text = deptSum.ToString(); - Cell50.Text = deptHisSum.ToString(); - }else{ - - if(deptName == "科室"){ - - deptSum = Convert.ToDouble(rowData["SettleFee"].ToString()); - deptHisSum = Convert.ToDouble(rowData["Fee"].ToString()); - - Cell38.Text = rowData["SettleFee"].ToString(); - Cell50.Text = rowData["Fee"].ToString(); - - }else{ - - deptSum = Convert.ToDouble(rowData["SettleFee"].ToString()); - deptHisSum = Convert.ToDouble(rowData["Fee"].ToString()); - - Cell38.Text = deptSum.ToString(); - Cell50.Text = deptHisSum.ToString(); - } - - deptName = rowData["DeptName"].ToString(); - } +// if(deptName.Equals(rowData["DeptName"].ToString())) +// { +// deptSum += Convert.ToDouble(rowData["SettleFee"].ToString()); +// deptHisSum += Convert.ToDouble(rowData["Fee"].ToString()); +// +// Cell38.Text = deptSum.ToString(); +// Cell50.Text = deptHisSum.ToString(); +// }else{ +// +// if(deptName == "科室"){ +// +// deptSum = Convert.ToDouble(rowData["SettleFee"].ToString()); +// deptHisSum = Convert.ToDouble(rowData["Fee"].ToString()); +// +// Cell38.Text = rowData["SettleFee"].ToString(); +// Cell50.Text = rowData["Fee"].ToString(); +// +// }else{ +// +// deptSum = Convert.ToDouble(rowData["SettleFee"].ToString()); +// deptHisSum = Convert.ToDouble(rowData["Fee"].ToString()); +// +// Cell38.Text = deptSum.ToString(); +// Cell50.Text = deptHisSum.ToString(); +// } +// +// deptName = rowData["DeptName"].ToString(); +// } } } } @@ -73,110 +73,148 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + +