|  | @ -255,6 +255,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
 | 
	
		
			
				|  |  |             return result;
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         List<BasePatientDO> addPatients = patientDao.findByNameAndIdcard(name,idcard);
 | 
	
		
			
				|  |  |         BasePatientDO addPatient = new BasePatientDO();
 | 
	
		
			
				|  |  |         if (2  == type){
 | 
	
		
			
				|  |  |             if (addPatients.size()==0){
 | 
	
		
			
				|  |  |                 BasePatientDO basePatientDO = new BasePatientDO();
 | 
	
	
		
			
				|  | @ -278,6 +279,11 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
 | 
	
		
			
				|  |  |                 basePatientDO.setLocked(0);
 | 
	
		
			
				|  |  |                 basePatientDO.setEnabled(1);
 | 
	
		
			
				|  |  |                 patientDao.save(basePatientDO);
 | 
	
		
			
				|  |  |                 addPatient = basePatientDO;
 | 
	
		
			
				|  |  |             }else {
 | 
	
		
			
				|  |  |                 result.put(ResponseContant.resultFlag,ResponseContant.fail);
 | 
	
		
			
				|  |  |                 result.put(ResponseContant.resultMsg,"添加成员已存在");
 | 
	
		
			
				|  |  |                 return result;
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }else {
 | 
	
		
			
				|  |  |             if (addPatients.size()==0){
 | 
	
	
		
			
				|  | @ -285,10 +291,8 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
 | 
	
		
			
				|  |  |                 result.put(ResponseContant.resultMsg,"添加成员不存在");
 | 
	
		
			
				|  |  |                 return result;
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |             addPatient = addPatients.get(0);
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         BasePatientDO addPatient = addPatients.get(0);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         // 添加自己与对方的关系
 | 
	
		
			
				|  |  |         BasePatientFamilyMemberDO fm = memberDao.findByPatientAndFamilyMember(patientDO.getId(), addPatient.getId());
 | 
	
		
			
				|  |  |         // 家庭关系已存在时,不重复添加
 |