ydlife 我的团队中数据查询03

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

@@ -821,6 +821,8 @@ 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);
                             }
                         }
                         groupList.addAll(s2DataList);
@@ -828,12 +830,16 @@ 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);
                             }
                         }
 
                         for (TeamMemberDetail teamMemberDetail : s2DataList) {
                             if (null != teamMemberDetail.getOwnerPractitionerId() &&  teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
                                 teamMemberList.add(teamMemberDetail);
+                            }else{
+                                teamMemberList.addAll(s2DataList);
                             }
                         }
                         groupList.addAll(s3DataList);
@@ -844,6 +850,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
                     resp.setSystemName(teamList.get(0).getSystem());
                 }
+                if(groupList == null || groupList.size() == 0){
+                    groupList.addAll(dataList);
+                }
             }
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setTeamMemberDetail(groupList);