|  | @ -1,10 +1,12 @@
 | 
	
		
			
				|  |  | package com.yihu.wlyy.service.manager.family;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | import com.yihu.wlyy.entity.Doctor;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.entity.Patient;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.entity.SignFamily;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.repository.PatientDao;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.repository.PatientFamilyMemberDao;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.service.BaseService;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.service.manager.hos.HosDoctorService;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.service.manager.sign.FamilyContractService;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.util.CommonUtil;
 | 
	
		
			
				|  |  | import org.apache.commons.lang3.StringUtils;
 | 
	
	
		
			
				|  | @ -37,6 +39,8 @@ public class FamilyMemberService extends BaseService {
 | 
	
		
			
				|  |  |     @Autowired
 | 
	
		
			
				|  |  |     FamilyContractService contractService;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     private HosDoctorService hosDoctorService;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     Map<Integer, String> relations = new HashMap<>();
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -59,7 +63,7 @@ public class FamilyMemberService extends BaseService {
 | 
	
		
			
				|  |  |      * @param patient
 | 
	
		
			
				|  |  |      * @return
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     public List<Map<String,Object>> getAllFamilyMembers(String patient){
 | 
	
		
			
				|  |  |     public List<Map<String,Object>> getAllFamilyMembers(String patient) throws Exception {
 | 
	
		
			
				|  |  |         List<Map<String,Object>> list = new ArrayList<>();
 | 
	
		
			
				|  |  |         list.add(getPatient(patient));
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -89,8 +93,11 @@ public class FamilyMemberService extends BaseService {
 | 
	
		
			
				|  |  |                         jtSign = true;
 | 
	
		
			
				|  |  |                     }
 | 
	
		
			
				|  |  |                     map1.put("statusName","已签约");
 | 
	
		
			
				|  |  |                     map1.put("doctor",sign.getDoctor());
 | 
	
		
			
				|  |  |                     String doctorCode = sign.getDoctor();
 | 
	
		
			
				|  |  |                     map1.put("doctor",doctorCode);
 | 
	
		
			
				|  |  |                     map1.put("doctorName",sign.getDoctorName());
 | 
	
		
			
				|  |  |                     Doctor doctor = hosDoctorService.getDoctorByCode(doctorCode);
 | 
	
		
			
				|  |  |                     map1.put("doctorMobile",doctor.getMobile());
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 Integer family_relation = Integer.valueOf(map.get("family_relation").toString());
 | 
	
		
			
				|  |  |                 map1.put("code", map.get("code"));
 |