ydlife 我的团队中数据查询07

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

@@ -844,9 +844,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                                 teamMemberList.add(teamMemberDetail);
                             }
                         }
-                        if(teamMemberList == null || teamMemberList.size() == 0){
-                            teamMemberList.addAll(s1DataList);
-                        }
+                        getTeamMemberDetails(s1DataList,teamMemberList,"1");
                         groupList.addAll(s2DataList);
                     } else if ("S3".equals(teamList.get(0).getPractitionerLevel())) {
                         for (TeamMemberDetail teamMemberDetail : s1DataList) {
@@ -854,17 +852,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                                 teamMemberList.add(teamMemberDetail);
                             }
                         }
-                        if(teamMemberList == null || teamMemberList.size() == 0){
-                            teamMemberList.addAll(s1DataList);
-                        }
+                        getTeamMemberDetails(s1DataList,teamMemberList,"1");
                         for (TeamMemberDetail teamMemberDetail : s2DataList) {
                             if (null != teamMemberDetail.getOwnerPractitionerId() &&  teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
                                 teamMemberList.add(teamMemberDetail);
                             }
                         }
-                        if(teamMemberList == null || teamMemberList.size() == 0){
-                            teamMemberList.addAll(s2DataList);
-                        }
+
+                        getTeamMemberDetails(s2DataList,teamMemberList,"2");
                         groupList.addAll(s3DataList);
 
                     } else if ("S1".equals(teamList.get(0).getPractitionerLevel())) {
@@ -903,6 +898,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return resp;
     }
 
+    private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) {
+        if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){
+            List<TeamMemberDetail> list = s1DataList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+                    () -> new TreeSet<>(Comparator.comparing(TeamMemberDetail::getSId))), ArrayList::new));
+            teamMemberList.addAll(list);
+        }
+
+    }
+
     @Override
     public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
         QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();