fix bug 去重

server/src/main/java/com/pica/cloud/account/account/server/service/impl/PatHealthPackServiceIml.java

@@ -146,6 +146,9 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
         List<AcctPatFamily> patFamilyList = patFamilyMapper.getListByAcctId(acctId);
         List<AcctPatFamilyDto> dtos =  new ArrayList<>();
         List<Integer> allPadIds = patFamilyList.stream().map(obj ->obj.getPatientId()).collect(toList());
+        if(CollectionUtils.isEmpty(allPadIds)){
+            return resp;
+        }
         if(1 == containAcct){
             resp.setMemberPatIds(allPadIds);
             for(AcctPatFamily family : patFamilyList){
@@ -156,16 +159,17 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
             }
         }else if(0 == containAcct){
             //不包含建立acct账户的pat数据
-            patFamilyList = patFamilyMapper.getListByPatIds(allPadIds);
+            List<AcctPatFamily> acctList = patFamilyMapper.getByPatIdSelfList(allPadIds);
+            List<Integer> acctPatIds = acctList.stream().map(obj -> obj.getPatientId()).collect(toList());
             for(AcctPatFamily family : patFamilyList){
-                AcctPatFamilyDto dto = new AcctPatFamilyDto();
-                if(!family.getRelation().equals(1)){
+                if(!acctPatIds.contains(family.getPatientId())){
+                    AcctPatFamilyDto dto = new AcctPatFamilyDto();
                     dto.setPatientId(family.getPatientId());
                     dto.setRelation(family.getRelation());
                     dtos.add(dto);
                 }
             }
-            resp.setMemberPatIds(dtos.stream().map(obj ->obj.getPatientId()).filter(x -> x!=null).collect(toList()));
+            resp.setMemberPatIds(dtos.stream().distinct().map(obj ->obj.getPatientId()).filter(x -> x!=null).collect(toList()));
         }
 
         resp.setMemberList(dtos);