ydlife 我的团队中数据查询08

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

@@ -823,9 +823,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                         }
                         }
                     }
                     }
                     //没有团队长
                     //没有团队长
-                    if(teamMemberList == null || teamMemberList.size() == 0){
-                        teamMemberList.addAll(s1DataList);
-                    }
+                    getTeamMemberDetails(s1DataList,teamMemberList,"1");
                     groupList.addAll(s2DataList);
                     groupList.addAll(s2DataList);
                 }
                 }
                 //如果是s1 直接显示所有
                 //如果是s1 直接显示所有
@@ -865,7 +863,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     } else if ("S1".equals(teamList.get(0).getPractitionerLevel())) {
                     } else if ("S1".equals(teamList.get(0).getPractitionerLevel())) {
                         groupList.addAll(dataList);
                         groupList.addAll(dataList);
                     }
                     }
-
                     resp.setSystemName(teamList.get(0).getSystem());
                     resp.setSystemName(teamList.get(0).getSystem());
                 }
                 }
                 if(groupList == null || groupList.size() == 0){
                 if(groupList == null || groupList.size() == 0){
@@ -873,9 +870,11 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 }
                 }
             }
             }
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
-            teamMemberList = teamMemberList.stream().distinct().collect(Collectors.toList());
+            List<TeamMemberDetail> lastList = new ArrayList<>();
+            getTeamMemberDetails(teamMemberList,lastList,"2");
+
             //排序
             //排序
-            teamMemberList.sort(Comparator.comparing(TeamMemberDetail::getSystemType).reversed());
+            lastList.sort(Comparator.comparing(TeamMemberDetail::getSystemType).reversed());
             Collections.sort(groupList,new Comparator<TeamMemberDetail>() {
             Collections.sort(groupList,new Comparator<TeamMemberDetail>() {
                 @Override
                 @Override
                 public int compare(TeamMemberDetail o1, TeamMemberDetail o2) {
                 public int compare(TeamMemberDetail o1, TeamMemberDetail o2) {
@@ -889,7 +888,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 }
                 }
             });
             });
             resp.setTeamMemberDetail(groupList);
             resp.setTeamMemberDetail(groupList);
-            resp.setTeamMemberList(teamMemberList);
+            resp.setTeamMemberList(lastList);
 
 
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
@@ -898,6 +897,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return resp;
         return resp;
     }
     }
 
 
+    //没有团队长的组织 根据体系id去重，只显示一个组织
     private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) {
     private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) {
         if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){
         if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){
             List<TeamMemberDetail> list = s1DataList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
             List<TeamMemberDetail> list = s1DataList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(