Merge branch 'dev' of chenweida/patient-co-management into dev

src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamMemberDao.java

@@ -42,7 +42,6 @@ public interface DoctorAdminTeamMemberDao extends
                                         @Param(value = "teamId") long teamId,
                                         Pageable pageable);
    @Query("SELECT d FROM AdminTeamMember m, AdminTeam t, Doctor d WHERE t.id = :teamId AND t.id = m" +
            ".teamId AND m.doctorCode = d.code and  d.code != :doctorCode and d.level != 1 ")
    @Query("SELECT d FROM AdminTeamMember m, AdminTeam t, Doctor d WHERE t.id = ?1 AND t.id = m.teamId AND m.doctorCode = d.code and  d.code != ?2 and d.level != 1 ")
    List<Doctor> findAllHeathExcludeThis(long teamId, String doctorCode);
}