|  | @ -78,7 +78,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
 | 
	
		
			
				|  |  |             "BaseDoctorDO d, BaseDoctorDO c " +
 | 
	
		
			
				|  |  |             "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 " +
 | 
	
		
			
				|  |  |             "and (a.adminTeamCode = ?2 or a.doctorCode=?3) and a.status > '0' order by a.followupPlanDate")
 | 
	
		
			
				|  |  |     Page<Object> findByPatientAndTeam(String patient, Long teamCode, String doctor, PageRequest pageable);
 | 
	
		
			
				|  |  |     Page<Object> findByPatientAndTeam(String patient, Long teamCode, String doctor, Pageable pageable);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 查找所有的随访数据
 | 
	
	
		
			
				|  | @ -90,7 +90,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
 | 
	
		
			
				|  |  |             "c.id,c.name,c.photo" + ",a.followupDate,a.followupPlanDate,a.followupNextDate,a.id,a.followupNo,a.prescriptionCode " +
 | 
	
		
			
				|  |  |             "from Followup a, BaseDoctorDO d, BaseDoctorDO c " +
 | 
	
		
			
				|  |  |             "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1  and a.status > '0'")
 | 
	
		
			
				|  |  |     Page<Object> findByPatient(String patient, PageRequest pageable);
 | 
	
		
			
				|  |  |     Page<Object> findByPatient(String patient, Pageable pageable);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 查找所有的随访计划(未开始的归类为计划)
 | 
	
	
		
			
				|  | @ -102,7 +102,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
 | 
	
		
			
				|  |  |             "c.id,c.name,c.photo" + ",a.followupDate,a.followupPlanDate,a.followupNextDate,a.id,a.followupNo,a.prescriptionCode " +
 | 
	
		
			
				|  |  |             "from Followup a, BaseDoctorDO d, BaseDoctorDO c " +
 | 
	
		
			
				|  |  |             "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 and a.status = '2'")
 | 
	
		
			
				|  |  |     Page<Object> findPlanByPatient(String patient, PageRequest pageable);
 | 
	
		
			
				|  |  |     Page<Object> findPlanByPatient(String patient, Pageable pageable);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 查找所有的随访记录(进行中的,已完整的的归类为计划)
 | 
	
	
		
			
				|  | @ -114,7 +114,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
 | 
	
		
			
				|  |  |             "c.id,c.name,c.photo" + ",a.followupDate,a.followupPlanDate,a.followupNextDate,a.id,a.followupNo,a.prescriptionCode " +
 | 
	
		
			
				|  |  |             "from Followup a, BaseDoctorDO d, BaseDoctorDO c" +
 | 
	
		
			
				|  |  |             " where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 and (a.status = '1' or a.status = '3')")
 | 
	
		
			
				|  |  |     Page<Object> findRecordByPatient(String patient, PageRequest pageable);
 | 
	
		
			
				|  |  |     Page<Object> findRecordByPatient(String patient, Pageable pageable);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 查找所有的随访计划(未开始的归类为计划)
 | 
	
	
		
			
				|  | @ -129,7 +129,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
 | 
	
		
			
				|  |  |             "from Followup a, BaseDoctorDO d, BaseDoctorDO c where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 " +
 | 
	
		
			
				|  |  |             "and (a.adminTeamCode = ?2 or a.doctorCode=?3) and a.status = '2' " +
 | 
	
		
			
				|  |  |             "order by a.followupPlanDate")
 | 
	
		
			
				|  |  |     Page<Object> findPlanByPatientAndTeam(String patient, Long teamCode, String doctor, PageRequest pageable);
 | 
	
		
			
				|  |  |     Page<Object> findPlanByPatientAndTeam(String patient, Long teamCode, String doctor, Pageable pageable);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
	
		
			
				|  | @ -145,7 +145,7 @@ public interface FollowUpDao extends PagingAndSortingRepository<Followup, Long>,
 | 
	
		
			
				|  |  |             "from Followup a, BaseDoctorDO d, BaseDoctorDO c " +
 | 
	
		
			
				|  |  |             "where a.doctorCode = d.id and a.creater = c.id and a.patientCode = ?1 " +
 | 
	
		
			
				|  |  |             "and (a.adminTeamCode = ?2 or a.doctorCode=?3) and (a.status = '1' or a.status = '3')  order by a.followupPlanDate")
 | 
	
		
			
				|  |  |     Page<Object> findRecordByPatientAndTeam(String patient, Long teamCode, String doctor, PageRequest pageable);
 | 
	
		
			
				|  |  |     Page<Object> findRecordByPatientAndTeam(String patient, Long teamCode, String doctor, Pageable pageable);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 根据续方CODE获取随访记录
 |