Skip to content

Y
yd-backend
Commit 46155011 by hongzhong
Options

ydlife 我的团队中数据查询03

parent d9e82b60
Showing with 9 additions and 0 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -821,6 +821,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -821,6 +821,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
for (TeamMemberDetail teamMemberDetail : s1DataList) { for (TeamMemberDetail teamMemberDetail : s1DataList) {
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) { if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail); teamMemberList.add(teamMemberDetail);
}else{
teamMemberList.addAll(s1DataList);
} }
} }
groupList.addAll(s2DataList); groupList.addAll(s2DataList);
...@@ -828,12 +830,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -828,12 +830,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
for (TeamMemberDetail teamMemberDetail : s1DataList) { for (TeamMemberDetail teamMemberDetail : s1DataList) {
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) { if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail); teamMemberList.add(teamMemberDetail);
}else{
teamMemberList.addAll(s1DataList);
} }
} }
for (TeamMemberDetail teamMemberDetail : s2DataList) { for (TeamMemberDetail teamMemberDetail : s2DataList) {
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) { if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail); teamMemberList.add(teamMemberDetail);
}else{
teamMemberList.addAll(s2DataList);
} }
} }
groupList.addAll(s3DataList); groupList.addAll(s3DataList);
...@@ -844,6 +850,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -844,6 +850,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
resp.setSystemName(teamList.get(0).getSystem()); resp.setSystemName(teamList.get(0).getSystem());
} }
if(groupList == null || groupList.size() == 0){
groupList.addAll(dataList);
}
} }
resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000"))); resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
resp.setTeamMemberDetail(groupList); resp.setTeamMemberDetail(groupList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment