diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
index 916c69a3..6adc2fea 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java
@@ -17,7 +17,6 @@ import com.hzya.frame.uuid.UUIDLong;
 import com.hzya.frame.uuid.UUIDUtils;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -825,30 +824,151 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         sendData.put("period",cjzq);
 
         JSONArray reportList = new JSONArray();
-
-        JSONObject zcfzb = new JSONObject();//资产负债表
+        JSONObject zcfzb = new JSONObject();//资产负债表1：期末余额 2：年初余额
         zcfzb.put("period",cjzq);
         zcfzb.put("reportType",1);
         JSONArray reportSubjects1 = new JSONArray();
-        setDataToArray("subjectName","12312",1,reportSubjects1);
+        setDataToArray("货币资金",dydata.getString(""),"2",reportSubjects1);
+        setDataToArray("短期借款","3","4",reportSubjects1);
+        setDataToArray("交易性金融资产","5","6",reportSubjects1);
+        setDataToArray("以公允价值计量且其变动计入当期损益的金融负债","7","8",reportSubjects1);
+        setDataToArray("应收票据","9","10",reportSubjects1);
+        setDataToArray("应付票据","11","12",reportSubjects1);
+        setDataToArray("应收账款","13","14",reportSubjects1);
+        setDataToArray("应付账款","15","16",reportSubjects1);
+        setDataToArray("减：坏账准备","17","18",reportSubjects1);
+        setDataToArray("预收款项","19","20",reportSubjects1);
+        setDataToArray("预付款项","21","22",reportSubjects1);
+        setDataToArray("合同负债","23","24",reportSubjects1);
+        setDataToArray("应收利息","25","26",reportSubjects1);
+        setDataToArray("应付职工薪酬","27","28",reportSubjects1);
+        setDataToArray("应收股利","29","30",reportSubjects1);
+        setDataToArray("应交税费","31","32",reportSubjects1);
+        setDataToArray("其他应收款","33","34",reportSubjects1);
+        setDataToArray("应付利息","35","36",reportSubjects1);
+        setDataToArray("减：坏账准备","37","38",reportSubjects1);
+        setDataToArray("应付股利","39","40",reportSubjects1);
+        setDataToArray("存货","41","42",reportSubjects1);
+        setDataToArray("其他应付款","43","44",reportSubjects1);
+        setDataToArray("合同资产","45","46",reportSubjects1);
+        setDataToArray("其他流动资产","47","48",reportSubjects1);
+        setDataToArray("长期借款","49","50",reportSubjects1);
+        setDataToArray("应付债券","51","52",reportSubjects1);
+        setDataToArray("债权投资","53","54",reportSubjects1);
+        setDataToArray("长期应收款","55","56",reportSubjects1);
+        setDataToArray("长期股权投资","57","58",reportSubjects1);
+        setDataToArray("租赁负债","59","60",reportSubjects1);
+        setDataToArray("长期应付款","61","62",reportSubjects1);
+        setDataToArray("其他非流动金融资产","63","64",reportSubjects1);
+        setDataToArray("专项应付款","65","66",reportSubjects1);
+        setDataToArray("投资性房地产","67","68",reportSubjects1);
+        setDataToArray("预计负债","69","70",reportSubjects1);
+        setDataToArray("递延收益","71","72",reportSubjects1);
+        setDataToArray("递延所得税负债","73","74",reportSubjects1);
+        setDataToArray("固定资产","75","76",reportSubjects1);
+        setDataToArray("减：累计折旧","77","78",reportSubjects1);
+        setDataToArray("减：固定资产减值准备","79","80",reportSubjects1);
+        setDataToArray("在建工程","81","82",reportSubjects1);
+        setDataToArray("实收资本（或股本）","83","84",reportSubjects1);
+        setDataToArray("工程物资","85","86",reportSubjects1);
+        setDataToArray("固定资产清理","87","88",reportSubjects1);
+        setDataToArray("资本公积","89","90",reportSubjects1);
+        setDataToArray("使用权资产","91","92",reportSubjects1);
+        setDataToArray("减：库存股","93","94",reportSubjects1);
+        setDataToArray("减：累计折旧","95","96",reportSubjects1);
+        setDataToArray("减：使用权资产减值准备","97","98",reportSubjects1);
+        setDataToArray("盈余公积","99","100",reportSubjects1);
+        setDataToArray("无形资产","101","102",reportSubjects1);
+        setDataToArray("未分配利润","103","104",reportSubjects1);
+        setDataToArray("减：累计摊销","105","106",reportSubjects1);
+        setDataToArray("减：无形资产减值准备","107","108",reportSubjects1);
+        setDataToArray("开发支出","109","110",reportSubjects1);
+        setDataToArray("商誉","111","112",reportSubjects1);
+        setDataToArray("长期待摊费用","113","114",reportSubjects1);
+        setDataToArray("递延所得税资产","115","116",reportSubjects1);
+        setDataToArray("其他非流动资产","117","118",reportSubjects1);
+
+
         zcfzb.put("reportSubjects",reportSubjects1);
 
-        JSONObject llb = new JSONObject();//利润表
+        JSONObject llb = new JSONObject();//利润表1：本年累计 2：上年累计
         llb.put("period",cjzq);
         llb.put("reportType",2);
         JSONArray reportSubjects2 = new JSONArray();
+
+        setDataToArray("一、营业收入","120","120",reportSubjects2);
+        setDataToArray("其中:主营业务收入","123","123",reportSubjects2);
+        setDataToArray("其他业务收入","126","126",reportSubjects2);
+        setDataToArray("减：营业成本","129","129",reportSubjects2);
+        setDataToArray("其中:主营业务成本","132","132",reportSubjects2);
+        setDataToArray("其他业务成本","135","135",reportSubjects2);
+        setDataToArray("税金及附加","138","138",reportSubjects2);
+        setDataToArray("销售费用","141","141",reportSubjects2);
+        setDataToArray("管理费用","144","144",reportSubjects2);
+        setDataToArray("财务费用（收益以\"－\"号填列）","147","147",reportSubjects2);
+        setDataToArray("其中：利息费用","150","150",reportSubjects2);
+        setDataToArray("利息收入","153","153",reportSubjects2);
+        setDataToArray("研发费用","156","156",reportSubjects2);
+        setDataToArray("资产减值损失","159","159",reportSubjects2);
+        setDataToArray("信用减值损失","162","162",reportSubjects2);
+        setDataToArray("加：公允价值变动净收益（净损失以\"－\"号填列）","165","165",reportSubjects2);
+        setDataToArray("投资净收益（净损失以\"－\"号填列）","168","168",reportSubjects2);
+        setDataToArray("资产处置收益（净损失以\"－\"号填列）","171","171",reportSubjects2);
+        setDataToArray("其他收益","174","174",reportSubjects2);
+        setDataToArray("二、营业利润","177","177",reportSubjects2);
+        setDataToArray("加:营业外收入","180","180",reportSubjects2);
+        setDataToArray("减:营业外支出","183","183",reportSubjects2);
+        setDataToArray("三、利润总额（亏损总额以“-”号填列）","186","186",reportSubjects2);
+        setDataToArray("减:所得税费用","189","189",reportSubjects2);
+        setDataToArray("四、净利润（净亏损以“-”号填列）","192","192",reportSubjects2);
+
         llb.put("reportSubjects",reportSubjects2);
 
-        JSONObject xjll = new JSONObject();//现金流量表
+        JSONObject xjll = new JSONObject();//现金流量表1：本年累计 2：上年累计
         xjll.put("period",cjzq);
         xjll.put("reportType",3);
         JSONArray reportSubjects3 = new JSONArray();
+        setDataToArray("销售商品、提供劳务收到的现金","201","201",reportSubjects3);
+        setDataToArray("收到的税费返还","203","203",reportSubjects3);
+        setDataToArray("收到的其他与经营活动有关的现金","205","205",reportSubjects3);
+        setDataToArray("现金收入小计","207","207",reportSubjects3);
+        setDataToArray("购买商品、接受劳务支付的现金","209","209",reportSubjects3);
+        setDataToArray("支付给职工以及为职工支付的现金","211","211",reportSubjects3);
+        setDataToArray("支付的各项税费","213","213",reportSubjects3);
+        setDataToArray("支付的其他与经营活动有关的现金","9999","9999",reportSubjects3);
+        setDataToArray("现金流出小计","10632","10632",reportSubjects3);
+        setDataToArray("经营活动产生的现金流量净额","-10425","-10425",reportSubjects3);
+        setDataToArray("收回投资所收到的现金","221","221",reportSubjects3);
+        setDataToArray("取得投资收益所收到的现金","223","223",reportSubjects3);
+        setDataToArray("处置固定资产、无形资产和其他长期资产所收回的现金净额","225","225",reportSubjects3);
+        setDataToArray("处置子公司及其他营业单位收到的现金净额","227","227",reportSubjects3);
+        setDataToArray("收到的其他与投资活动有关的现金","229","229",reportSubjects3);
+        setDataToArray("现金流入小计","231","231",reportSubjects3);
+        setDataToArray("购建固定资产、无形资产和其他长期资产所支付的现金","233","233",reportSubjects3);
+        setDataToArray("投资所支付的现金","235","235",reportSubjects3);
+        setDataToArray("取得子公司及其他营业单位收到的现金净额","237","237",reportSubjects3);
+        setDataToArray("其他与投资有关","239","239",reportSubjects3);
+        setDataToArray("现金流出小计","241","241",reportSubjects3);
+        setDataToArray("投资活动产生的现金流量净额","243","243",reportSubjects3);
+        setDataToArray("吸收投资所收到的现金","245","245",reportSubjects3);
+        setDataToArray("子公司吸收少数股东投资收到的现金","247","247",reportSubjects3);
+        setDataToArray("借贷所收到现金","249","249",reportSubjects3);
+        setDataToArray("发行债券收到的现金","251","251",reportSubjects3);
+        setDataToArray("收到的其他与筹资活动有关的现金","22222","22222",reportSubjects3);
+        setDataToArray("现金流入小计","23214","23214",reportSubjects3);
+        setDataToArray("偿还债务所支付的现金","257","257",reportSubjects3);
+        setDataToArray("分配股利、利润、偿付利息所支付的现金","259","259",reportSubjects3);
+        setDataToArray("支付的其他与筹资活动有关的现金","261","261",reportSubjects3);
+        setDataToArray("现金流出小计","263","263",reportSubjects3);
+        setDataToArray("筹资活动产生的现金流量净额","22951","22951",reportSubjects3);
+        setDataToArray("四、汇率变动对现金流量的影响","267","267",reportSubjects3);
+        setDataToArray("五、现金及现金等价物净增加额","13036","13036",reportSubjects3);
+
+
         xjll.put("reportSubjects",reportSubjects3);
 
 
 
-
-
         reportList.add(zcfzb);
         reportList.add(llb);
         reportList.add(xjll);
@@ -882,12 +1002,19 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         }
     }
 
-    private void setDataToArray(String subjectName, String value, Integer valueType, JSONArray reportSubjects) {
+    private void setDataToArray(String subjectName, String value,String value2, JSONArray reportSubjects) {
         if(value != null && !"".equals(value)){
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("subjectName",subjectName);
             jsonObject.put("value",new BigDecimal(value));
-            jsonObject.put("valueType",valueType);
+            jsonObject.put("valueType",1);
+            reportSubjects.add(jsonObject);
+        }
+        if(value2 != null && !"".equals(value2)){
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("subjectName",subjectName);
+            jsonObject.put("value",new BigDecimal(value2));
+            jsonObject.put("valueType",2);
             reportSubjects.add(jsonObject);
         }
     }