ydlife 我的团队中数据查询04

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -821,27 +821,29 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                         for (TeamMemberDetail teamMemberDetail : s1DataList) {
                             if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
                                 teamMemberList.add(teamMemberDetail);
-                            }else{
-                                teamMemberList.addAll(s1DataList);
                             }
                         }
+                        if(teamMemberList == null || teamMemberList.size() == 0){
+                            teamMemberList.addAll(s1DataList);
+                        }
                         groupList.addAll(s2DataList);
                     } else if ("S3".equals(teamList.get(0).getPractitionerLevel())) {
                         for (TeamMemberDetail teamMemberDetail : s1DataList) {
                             if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
                                 teamMemberList.add(teamMemberDetail);
-                            }else{
-                                teamMemberList.addAll(s1DataList);
                             }
                         }
-
+                        if(teamMemberList == null || teamMemberList.size() == 0){
+                            teamMemberList.addAll(s1DataList);
+                        }
                         for (TeamMemberDetail teamMemberDetail : s2DataList) {
                             if (null != teamMemberDetail.getOwnerPractitionerId() &&  teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
                                 teamMemberList.add(teamMemberDetail);
-                            }else{
-                                teamMemberList.addAll(s2DataList);
                             }
                         }
+                        if(teamMemberList == null || teamMemberList.size() == 0){
+                            teamMemberList.addAll(s2DataList);
+                        }
                         groupList.addAll(s3DataList);
 
                     } else if ("S1".equals(teamList.get(0).getPractitionerLevel())) {
@@ -855,6 +857,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 }
             }
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+            teamMemberList = teamMemberList.stream().distinct().collect(Collectors.toList());
             resp.setTeamMemberDetail(groupList);
             resp.setTeamMemberList(teamMemberList);