| 
					
				 | 
			
			
				@ -226,7 +226,7 @@ public class PatientReservationService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * 分页获取患者预约记录,医生为空查患者所有 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * 分页获取患者预约记录,根据团队 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @Transactional 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public JSONArray getReservationByPatient(String patient, Long teamCode, int page, int pagesize) throws Exception { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -243,7 +243,7 @@ public class PatientReservationService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //更新当前状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (list != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        /*if (list != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //遍历更新预约状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (PatientReservation item : list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                String type = item.getType(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -261,7 +261,7 @@ public class PatientReservationService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patientReservationDao.save(list); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (list != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            Map<String, Doctor> doctors = new HashMap<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -300,7 +300,7 @@ public class PatientReservationService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<PatientReservation> list = patientReservationDao.findByDoctor(doctor, pageRequest); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //更新当前状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (list != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        /*if (list != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //遍历更新预约状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (PatientReservation item : list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                String type = item.getType(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -317,7 +317,7 @@ public class PatientReservationService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patientReservationDao.save(list); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //返回患者头像 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        for (PatientReservation item : list) { 
			 |