|  | @ -29,33 +29,33 @@ public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam,
 | 
	
		
			
				|  |  | 	int countByPatient(String patient,Integer signType);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 被指定且未结束列表
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.del = '1' and b.del = '1' and a.type<3")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorList(String doctor, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 被指定且未结束列表
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.del = '1' and b.del = '1' and a.type<3")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorList(String doctor, long id, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 被指定且未结束列表
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and a.del = '1' and b.del = '1' and a.type<3 ")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorPointList(String doctor, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 被指定且未结束列表
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and a.del = '1' and b.del = '1' and a.type<3 ")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorPointList(String doctor, long id, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 医生参与且未结束列表
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1' and a.type<3")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorJoinList(String doctor, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1' and a.type<3 ")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorJoinList(String doctor, long id, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 医生参与并已结束列表
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 1 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.status = 1 and a.del = '1' and b.del = '1' and a.type<3")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorFinishList(String doctor, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 1 and a.del = '1' and b.del = '1'")
 | 
	
		
			
				|  |  | 	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and b.to = ?1 and a.id < ?2 and a.status = 1 and a.del = '1' and b.del = '1' and a.type<3")
 | 
	
		
			
				|  |  | 	Page<ConsultTeam> findDoctorFinishList(String doctor, long id, Pageable pageRequest);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 	// 医生关闭三师咨询
 |