diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java
index a87ffdd..23231eb 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java
@@ -1,8 +1,9 @@
 package com.ruoyi.invest.domain.vo;
 
 import com.ruoyi.invest.domain.AccountsDealRecord;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
 /**
  * 账户交易记录Vo对象 accounts_deal_record
  *
@@ -16,4 +17,7 @@ public class AccountsDealRecordVo extends AccountsDealRecord
     /** 账户 */
     private String accountName;
 
+
+    private String dealCategoryName;
+
 }
diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
index 4a82bbf..fb4f51d 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
@@ -1660,24 +1660,53 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         ) {
 
             if(vo.getDealType().equals("1")){
-                income+=vo.getAmount();
-                incomeCount++;
-                if(vo.getDealCategory().equals("5")){
-                    posIncome+=vo.getAmount();
-                    posIncomeCount++;
+
+                if(analysisDto.getDataType().equals("5")){
+                    if(vo.getDealCategory().equals("2")){
+                        income+=vo.getAmount();
+                        incomeCount++;
+                        if(vo.getDealCategory().equals("5")){
+                            posIncome+=vo.getAmount();
+                            posIncomeCount++;
+                        }
+                    }
+                } else {
+                    income+=vo.getAmount();
+                    incomeCount++;
+                    if(vo.getDealCategory().equals("5")){
+                        posIncome+=vo.getAmount();
+                        posIncomeCount++;
+                    }
                 }
             }
             //支出
             if(vo.getDealType().equals("2")){
-                expenses+=vo.getAmount();
-                expensesCount++;
-                if(vo.getDealCategory().equals("5")){
-                    posExpenses+=vo.getAmount();
-                    posExpensesCount++;
-                }
-                if(vo.getDealCategory().equals("1")){
-                    realExpenses+=vo.getAmount();
-                    realExpensesCount++;
+
+
+                if(analysisDto.getDataType().equals("5")){
+                    if(vo.getDealCategory().equals("2")){
+                        expenses+=vo.getAmount();
+                        expensesCount++;
+                        if(vo.getDealCategory().equals("5")){
+                            posExpenses+=vo.getAmount();
+                            posExpensesCount++;
+                        }
+                        if(vo.getDealCategory().equals("1")){
+                            realExpenses+=vo.getAmount();
+                            realExpensesCount++;
+                        }
+                    }
+                } else {
+                    expenses+=vo.getAmount();
+                    expensesCount++;
+                    if(vo.getDealCategory().equals("5")){
+                        posExpenses+=vo.getAmount();
+                        posExpensesCount++;
+                    }
+                    if(vo.getDealCategory().equals("1")){
+                        realExpenses+=vo.getAmount();
+                        realExpensesCount++;
+                    }
                 }
             }
         }
@@ -1717,7 +1746,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
             for (AccountsDealRecordVo vo:accountsDealRecordVoList
             ) {
                 if (null != vo.getDealCategory()) {
-                    vo.setDealCategory(DictUtils.getDictLabel("deal_category", vo.getDealCategory().toString()));
+                    vo.setDealCategoryName(DictUtils.getDictLabel("deal_category", vo.getDealCategory().toString()));
                 }
                 String dayString=dateFormat.format(vo.getCreateTime());
 
@@ -1736,12 +1765,28 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
 
                     if(staticsTime.equals(dayString)){
                         if(vo.getDealType().equals("1")){
-                            actualCreditBillDay+=vo.getAmount();
-                            details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategory()+"】收入"+vo.getAmount()+"；<br/>";
+                           if(analysisDto.getDataType().equals("5")){
+                               if(vo.getDealCategory().equals("2")){
+                                   actualCreditBillDay+=vo.getAmount();
+                                   details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易盈利"+vo.getAmount()+"；<br/>";
+                               }
+                           } else {
+                               actualCreditBillDay+=vo.getAmount();
+                               details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+"；<br/>";
+                           }
+
                         }
                         if(vo.getDealType().equals("2")){
-                            actualCreditBillDay-=vo.getAmount();
-                            details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategory()+"】支出"+vo.getAmount()+"；<br/>";
+                            if(analysisDto.getDataType().equals("5")){
+                                if(vo.getDealCategory().equals("2")){
+                                    actualCreditBillDay+=vo.getAmount();
+                                    details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易亏损"+vo.getAmount()+"；<br/>";
+                                }
+                            } else {
+                                actualCreditBillDay-=vo.getAmount();
+                                details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+"；<br/>";
+                            }
+
                         }
 
                     }