diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerController.java
index 9437a7bd..b9804ba3 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerController.java
@@ -76,6 +76,7 @@ public class CustomerController extends BaseController {
         startPage();
         List<Customer> list = customerService.getCustomerList(customer);
         for (Customer curCustomer: list) {
+            Long teamNum = 0L;
             List<Long> customerIds = new ArrayList<Long>(){{
                add(curCustomer.getCustomerId());
             }};
@@ -85,8 +86,9 @@ public class CustomerController extends BaseController {
                 customerQry.setCustomerPlace(curCustomer.getCustomerId());
                 customerQry.setStatus(Integer.valueOf(UserStatus.OK.getCode()));
                 List<Customer> nextLevelCustomers = customerService.getCustomerList(customerQry);
+                teamNum = teamNum + nextLevelCustomers.stream().filter(x->PlaceStatus.CAN_PLACE.getCode().equals(x.getPlaceStatus())).count();
                 List<Long> nextLevelCustomerIds = nextLevelCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList());
-                customerIds.addAll(nextLevelCustomerIds);
+//                customerIds.addAll(nextLevelCustomerIds);
             }
 
             // 本月第一天
@@ -107,26 +109,31 @@ public class CustomerController extends BaseController {
                 .setValue(customerService.countCustomer(customerParams));
             analyseItems.add(aItem1);
             // 本月绑定客户数
+            customerParams.setPlaceStatus(null);
             customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay());
             AnalyseItem aItem2 = new AnalyseItem()
-                .setType(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getType())
-                .setTitle(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getTitle())
-                .setUnit(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getUnit())
-                .setValue(customerService.countCustomer(customerParams));
+                    .setType(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getType())
+                    .setTitle(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getTitle())
+                    .setUnit(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getUnit())
+                    .setValue(customerService.countCustomer(customerParams));
             analyseItems.add(aItem2);
             // 团队
+            customerParams.setUpdateTimeStart(null);
+            customerParams.setPlaceStatus(PlaceStatus.CAN_PLACE.getCode());
             AnalyseItem aItem11 = new AnalyseItem()
-                .setType(AnalyseItemEnum.TEAM_MEMBER_NUM.getType())
-                .setTitle(AnalyseItemEnum.TEAM_MEMBER_NUM.getTitle())
-                .setUnit(AnalyseItemEnum.TEAM_MEMBER_NUM.getUnit())
-                .setValue(aItem1.getValue());
+                    .setType(AnalyseItemEnum.TEAM_MEMBER_NUM.getType())
+                    .setTitle(AnalyseItemEnum.TEAM_MEMBER_NUM.getTitle())
+                    .setUnit(AnalyseItemEnum.TEAM_MEMBER_NUM.getUnit())
+                    .setValue(customerService.countCustomer(customerParams));
             analyseItems.add(aItem11);
             // 本月绑定客户数
+            customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay());
+            customerParams.setPlaceStatus(PlaceStatus.CAN_PLACE.getCode());
             AnalyseItem aItem12 = new AnalyseItem()
                 .setType(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getType())
                 .setTitle(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getTitle())
                 .setUnit(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getUnit())
-                .setValue(aItem2.getValue());
+                .setValue(customerService.countCustomer(customerParams));
             analyseItems.add(aItem12);
 
             // 本月订单数及本月订单额
@@ -212,7 +219,7 @@ public class CustomerController extends BaseController {
             OrderMaster orderParams4 = new OrderMaster();
             orderParams4.setCustomerIds(customerIds);
             orderParams4.setCreateTimeStart(firstDayCurWeek.atStartOfDay());
-            List<OrderMaster> ordersCurWeek = orderMasterService.selectOrderMasterList(orderParams3);
+            List<OrderMaster> ordersCurWeek = orderMasterService.selectOrderMasterList(orderParams4);
             List<Long> orderIdsCurWeek = ordersCurWeek.stream().map(OrderMaster::getId).collect(Collectors.toList());
             BigDecimal totalMoneyCurWeek = new BigDecimal(0);
             if (CollectionUtils.isNotEmpty(orderIdsCurWeek)) {
diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
index f0b8f53a..1d1995c3 100644
--- a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
+++ b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
@@ -60,6 +60,9 @@
             <if test="openId != null and openId != ''">
                 AND open_id = #{openId}
             </if>
+            <if test="placeStatus != null and placeStatus != ''">
+                AND place_status = #{placeStatus}
+            </if>
             <if test="customerPlace != null and customerPlace != ''">
                 AND customer_place = #{customerPlace}
             </if>