Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/web/ExcelController.java

@@ -286,11 +286,11 @@ public class ExcelController extends AbstractController{
         writer.passCurrentRow();
         // 冻结前四行
         writer.setFreezePane(4);
-        writer.writeRow(Arrays.asList("成本项目代码", "成本项目名称", "开单科室", "开单科室代码", "执行科室", "执行科室代码", "医生编码","开单医生",
+        writer.writeRow(Arrays.asList("收入项目代码", "收入项目名称", "开单科室", "开单科室代码", "执行科室", "执行科室代码", "医生编码","开单医生",
                 "病人ID",	"住院号/门诊号",	"患者姓名",	"病人费别",	"收据费别",	"数量",	"单位",	"金额",	"费用发生时间"));
         int accountType = NumberConstant.ONE;
         int column = NumberConstant.FOUR;
-        getProductByAccountType(hospId, writer, accountType, column);
+//        getProductByAccountType(hospId, writer, accountType, column);
         writer.setColumnWidth(0, 20);
         writer.setColumnWidth(1, 20);
         writer.setColumnWidth(2, 10);