fix 获取上下级病人id接口

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

@@ -79,6 +79,20 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
         return patFamilyList.get(0).getAcctId();
     }
 
+    /**
+     * @Description
+     * 父亲（监护人）、母亲
+     *   儿子、女儿
+     *     孙子、孙女、外孙、外孙女
+     *
+     *   查询：儿子 patId查
+     *   返回：父亲，女儿，孙子，孙女 patId
+     * @Author peijun.zhao
+     * @Date 2020/5/20 17:11
+     * @ModifyDate 2020/5/20 17:11
+     * @Params [patientId]
+     * @Return java.util.List<java.lang.Integer>
+     */
     @Override
     public List<Integer> getDirectPatIdsByPatId(Integer patientId) {
         List<Integer> patIds = new ArrayList<>();
@@ -92,16 +106,27 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
             throw new PicaException(AccountExceptionEnum.PAT_MEMBER_HAS_MORE.getCode(), AccountExceptionEnum.PAT_MEMBER_HAS_MORE.getMessage());
         }
 
-        //add 病人id所在家庭组的监护人- 上级
-        AcctPatFamily parentMember = patFamilyMapper.getSelfByAcctId(memberList.get(0).getAcctId());
-        patIds.add(parentMember.getPatientId());
+        //add 病人id所在家庭组的监护人- patId
+        /*AcctPatFamily parentMember = patFamilyMapper.getSelfByAcctId(memberList.get(0).getAcctId());
+        patIds.add(parentMember.getPatientId());*/
 
-        //下级所有成员 包括自身
+        //同级所有成员 包括自身
         List<AcctPatFamily> patFamilyList = patFamilyMapper.getListByAcctId(memberList.get(0).getAcctId());
         patIds.addAll(patFamilyList.stream().map(obj -> obj.getPatientId()).collect(toList()));
-        return patIds;
-    }
 
+        //下级所有成员
+        List<AcctPatFamily> selfs = patFamilyMapper.getByPatIdSelf(memberList.get(0).getPatientId());
+        if(CollectionUtils.isNotEmpty(selfs)){
+            //自己存在监护人身份
+            List<AcctPatFamily> sonFamilyList = patFamilyMapper.getListByAcctId(selfs.get(0).getAcctId());
+            patIds.addAll(sonFamilyList.stream().map(obj -> obj.getPatientId()).collect(toList()));
+        }
+
+        //去除自身patId
+        List rtnPatIds = patIds.stream().distinct().filter(obj -> !obj.equals(patientId)).collect(toList());
+
+        return rtnPatIds;
+    }
 
     /**
      * @Description TODO