|  | @ -34,21 +34,25 @@ public class CustomerService{
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 		//查询签约信息
 | 
	
		
			
				|  |  | 		SignFamily signInfo = contractService.findSignInfo(patient.getCode());
 | 
	
		
			
				|  |  | 		if(signInfo!=null){
 | 
	
		
			
				|  |  | 			signInfo.setStatusName("已签约");
 | 
	
		
			
				|  |  | 		}
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 		//查询家庭成员的每个签约信息    以及签约医生
 | 
	
		
			
				|  |  | 		List doctors = new ArrayList<Doctor>();
 | 
	
		
			
				|  |  | 		for(Map<String, Object> familyMember:familyMembers) {
 | 
	
		
			
				|  |  | 			//查找签约的医生信息
 | 
	
		
			
				|  |  | 			String doctor = (String) familyMember.get("doctor");//医生code
 | 
	
		
			
				|  |  | 			if(StringUtils.isNotBlank(doctor)){
 | 
	
		
			
				|  |  | 				Doctor doctorInfo = hosDoctorService.getDoctorByCode(doctor);
 | 
	
		
			
				|  |  | 				if(null!=doctorInfo){
 | 
	
		
			
				|  |  | 					doctors.add(doctorInfo);
 | 
	
		
			
				|  |  | 				}
 | 
	
		
			
				|  |  | 		if(signInfo!=null){
 | 
	
		
			
				|  |  | 			signInfo.setStatusName("已签约");
 | 
	
		
			
				|  |  | 			//查找全科医生
 | 
	
		
			
				|  |  | 			String doctorCode = signInfo.getDoctor();
 | 
	
		
			
				|  |  | 			if(StringUtils.isNotBlank(doctorCode)){
 | 
	
		
			
				|  |  | 				Doctor doctor = hosDoctorService.getDoctorByCode(doctorCode);
 | 
	
		
			
				|  |  | 				doctors.add(doctor);
 | 
	
		
			
				|  |  | 			}
 | 
	
		
			
				|  |  | 			//查找健康管理师
 | 
	
		
			
				|  |  | 			String doctorHealthCode = signInfo.getDoctorHealth();
 | 
	
		
			
				|  |  | 			if(StringUtils.isNotBlank(doctorHealthCode)){
 | 
	
		
			
				|  |  | 				Doctor doctor = hosDoctorService.getDoctorByCode(doctorHealthCode);
 | 
	
		
			
				|  |  | 				doctors.add(doctor);
 | 
	
		
			
				|  |  | 			}
 | 
	
		
			
				|  |  | 		}
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 		resp.put("signInfo",signInfo);
 | 
	
		
			
				|  |  | 		resp.put("doctors",doctors);
 | 
	
		
			
				|  |  | 
 |