diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java
index 5bcad824f..284b5a010 100644
--- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java
+++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationRequest.java
@@ -9,6 +9,7 @@ import com.engine.salary.entity.taxdeclaration.po.TaxReportColumnPO;
 import com.engine.salary.enums.datacollection.TaxFreeTypeEnum;
 import com.engine.salary.enums.employeedeclare.CardTypeEnum;
 import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
+import com.engine.salary.enums.salarysob.DeclareReportTypeEnum;
 import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryEntityUtil;
@@ -43,6 +44,10 @@ public class TaxDeclarationRequest {
         Map<String, List<TaxReportColumnPO>> taxReportColumnMap = SalaryEntityUtil.group2Map(taxReportColumns, TaxReportColumnPO::getIncomeCategory);
         Map<Long, EmployeeDeclarePO> employeeDeclareMap = SalaryEntityUtil.convert2Map(employeeDeclares, EmployeeDeclarePO::getEmployeeId);
         Map<Long, List<TaxDeclarationValuePO>> taxDeclarationValueMap = SalaryEntityUtil.group2Map(taxDeclarationValues, TaxDeclarationValuePO::getTaxDeclarationId);
+        taxDeclarations = taxDeclarations.stream()
+                .filter(taxDeclaration -> IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()) != null
+                        && IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()).getReportType()== DeclareReportTypeEnum.COMPREHENSIVE_INCOME)
+                .collect(Collectors.toList());
         for (TaxDeclarationPO taxDeclaration : taxDeclarations) {
             List<TaxDeclarationValuePO> values = taxDeclarationValueMap.get(taxDeclaration.getId());
             for (TaxDeclarationValuePO taxDeclarationValue : values) {
@@ -338,6 +343,10 @@ public class TaxDeclarationRequest {
         Map<String, List<TaxReportColumnPO>> taxReportColumnMap = SalaryEntityUtil.group2Map(taxReportColumns, TaxReportColumnPO::getIncomeCategory);
         Map<Long, EmployeeDeclarePO> employeeDeclareMap = SalaryEntityUtil.convert2Map(employeeDeclares, EmployeeDeclarePO::getEmployeeId);
         Map<Long, List<TaxDeclarationValuePO>> taxDeclarationValueMap = SalaryEntityUtil.group2Map(taxDeclarationValues, TaxDeclarationValuePO::getTaxDeclarationId);
+        taxDeclarations = taxDeclarations.stream()
+                .filter(taxDeclaration -> IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()) != null
+                        && IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()).getReportType()== DeclareReportTypeEnum.CLASSIFIED_INCOME)
+                .collect(Collectors.toList());
         for (TaxDeclarationPO taxDeclaration : taxDeclarations) {
             List<TaxDeclarationValuePO> values = taxDeclarationValueMap.get(taxDeclaration.getId());
             IncomeCategoryEnum incomeCategoryEnum = IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory());
@@ -380,6 +389,10 @@ public class TaxDeclarationRequest {
         Map<String, List<TaxReportColumnPO>> taxReportColumnMap = SalaryEntityUtil.group2Map(taxReportColumns, TaxReportColumnPO::getIncomeCategory);
         Map<Long, EmployeeDeclarePO> employeeDeclareMap = SalaryEntityUtil.convert2Map(employeeDeclares, EmployeeDeclarePO::getEmployeeId);
         Map<Long, List<TaxDeclarationValuePO>> taxDeclarationValueMap = SalaryEntityUtil.group2Map(taxDeclarationValues, TaxDeclarationValuePO::getTaxDeclarationId);
+        taxDeclarations = taxDeclarations.stream()
+                .filter(taxDeclaration -> IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()) != null
+                        && IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()).getReportType()== DeclareReportTypeEnum.NONRESIDENT_INCOME)
+                .collect(Collectors.toList());
         for (TaxDeclarationPO taxDeclaration : taxDeclarations) {
             List<TaxDeclarationValuePO> values = taxDeclarationValueMap.get(taxDeclaration.getId());
             for (TaxDeclarationValuePO taxDeclarationValue : values) {