添加用户信息

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

@@ -350,55 +350,23 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
         //check member valid
         List<AcctPatFamilyDto> memberList = familyReqReq.getMemberList();
         List<AcctPatFamilyDto> failList = new ArrayList<>();
-        List<Integer> patIds = memberList.stream().map(obj -> obj.getPatientId()).collect(toList());
-        List<AcctPatFamilyDto> relatedPats = new ArrayList<>();
-        List<AcctPatFamily> members = patFamilyMapper.getMemberListByPatIds(patIds);
-        for (AcctPatFamily member : members) {
-            if (!familyReqReq.getAcctId().equals(member.getAcctId())) {
-                //居民已被其他账户绑定为家庭成员
-                AcctPatFamilyDto failOne = new AcctPatFamilyDto();
-                failOne.setPatientId(member.getPatientId());
-                failOne.setRelation(member.getRelation());
-                failList.add(failOne);
-                successFlag = false;
-                resp.setFailMsg(AccountExceptionEnum.PAT_MEMBER_HAS_MORE.getMessage());
-                resp.setCode(AccountExceptionEnum.PAT_MEMBER_HAS_MORE.getCode());
-            } else {
-                //居民已被传入acctId关联为家庭成员，不需要再保存
-                AcctPatFamilyDto failOneRelated = new AcctPatFamilyDto();
-                failOneRelated.setRelation(member.getRelation());
-                failOneRelated.setPatientId(member.getPatientId());
-                relatedPats.add(failOneRelated);
-                successFlag = false;
-                resp.setFailMsg(AccountExceptionEnum.PAT_MEMBER_HAS_BINDED_SELF.getMessage());
-                resp.setCode(AccountExceptionEnum.PAT_MEMBER_HAS_BINDED_SELF.getCode());
-            }
-        }
-
-        //已关联自身居民list
-        if (relatedPats.size() > 0) {
-            successFlag = false;
-            failList.addAll(relatedPats);
-        }
-
-        //通过后 再建立家庭关系
-        if (successFlag) {
-            AcctPatFamily acct = patFamilyMapper.getSelfByAcctId(familyReqReq.getAcctId());
-            for (AcctPatFamilyDto member : memberList) {
+        List<AcctPatFamily> patFamilyList = patFamilyMapper.getListByAcctId(familyReqReq.getAcctId());
+        List<Integer> patientIdList = patFamilyList.stream().map(obj -> obj.getPatientId()).collect(toList());
+        for (AcctPatFamilyDto member : memberList) {
+            if (!patientIdList.contains(member.getPatientId())) {
                 AcctPatFamily entity = new AcctPatFamily();
                 entity.setAcctId(familyReqReq.getAcctId());
                 entity.setPatientId(member.getPatientId());
                 entity.setRelation(member.getRelation());
 
                 entity.setDeleteFlag(1);
-                entity.setCreatedId(acct.getPatientId());
-                entity.setModifiedId(acct.getPatientId());
+                entity.setCreatedId(familyReqReq.getAcctId());
+                entity.setModifiedId(familyReqReq.getAcctId());
                 entity.setCreatedTime(new Date());
                 entity.setModifiedTime(new Date());
                 patFamilyMapper.insert(entity);
             }
         }
-
         resp.setSuccessFlag(successFlag);
         resp.setFailMemberList(failList);
         return resp;