省监管统计

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderInfoServiceImpl.java

@@ -866,11 +866,12 @@ public class FgOrderInfoServiceImpl extends BaseModelServiceImpl<OrderInfo,Integ
 		.filter(val -> StringUtils.isNotEmpty(val.getIsbn()))
 		.collect(Collectors.toList());
 		
-		vo.setTotalOrderType(valList.size());
+
 		Integer countrytype = (int) voList.stream().filter(str -> str.getCountryStatus().equals("1")).count();//国家规划教材种类
 		Integer noCountrytype = (int) voList.stream().filter(str -> str.getCountryStatus().equals("0")).count();//非国家规划教材数量
 		vo.setCountryType(countrytype);
 		vo.setNoCountryType(noCountrytype);
+		vo.setTotalOrderType(countrytype + noCountrytype);
 		return vo;
 	}