补充提交-AGMS的Dashboard中PEP查询

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsDashboardDALServiceImpl.java

@@ -35,8 +35,10 @@ public class AgmsDashboardDALServiceImpl implements AgmsDashboardDALService {
                 practitionerNum = practitionerNumMap.get(statisticsPEPInfo.getBranchId());
                 statisticsPEPInfo.setPractitionerNum(practitionerNum);
             }else if (type.equalsIgnoreCase("T")){
-                Long subordinateId = statisticsPEPInfo.getSubordinateId();
-                practitionerNum = practitionerNumMap.get(subordinateId);
+                practitionerNum = practitionerNumMap.get(statisticsPEPInfo.getSubordinateId());
+                statisticsPEPInfo.setPractitionerNum(practitionerNum);
+            }else {
+                practitionerNum = practitionerNumMap.get(0L);
                 statisticsPEPInfo.setPractitionerNum(practitionerNum);
             }
             Double scoreDay = BigDecimal.valueOf(statisticsPEPInfo.getScoreDay())

yd-api/src/main/resources/mapper/agms/AgmsDashboardMapper.xml

@@ -21,6 +21,7 @@ select if(b.branch_name is null,'暂无公司',b.branch_name) branchName,
              left join ag_acl_practitioner_subordinate_system s on s.id = p.subordinate_system_id
              left join ag_acl_practitioner_setting ps on ps.practitioner_id = p.id
     where ps.practitioner_type_id = 28
+        and p.is_active = 1
         and not EXISTS(
                 select tt.leads_assigned_id
                 from ag_mkt_leads_assigned_track tt
@@ -79,6 +80,7 @@ from ag_acl_practitioner p
          left join ag_acl_practitioner_setting ps on ps.practitioner_id = p.id
 where
     ps.practitioner_type_id = 28
+    and p.is_active = 1
     and not EXISTS(
         select tt.leads_assigned_id
         from ag_mkt_leads_assigned_track tt
@@ -103,11 +105,15 @@ select
         <when test="type.equalsIgnoreCase('T')">
             if(p.subordinate_system_id is null,0,p.subordinate_system_id) id,
         </when>
+        <otherwise>
+            0 id,
+        </otherwise>
     </choose>
        count(p.id) practitionerNum
 from ag_acl_practitioner p
     left join ag_acl_practitioner_setting ps on ps.practitioner_id = p.id
 where ps.practitioner_type_id = 28
+    and p.is_active = 1
     <choose>
         <when test="type.equalsIgnoreCase('B')">
             group by p.insurer_branch_id