Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -281,9 +281,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                patientDao.save(basePatientDO);
                addPatient = basePatientDO;
            }else {
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"添加成员已存在");
                return result;
                addPatient = addPatients.get(0);
            }
        }else {
            if (addPatients.size()==0){