增加SpEL依赖;合并非团队内医生查询接口方法

pom.xml

@@ -13,7 +13,7 @@
        <springside.version>4.2.3-GA</springside.version>
        <spring.version>4.2.6.RELEASE</spring.version>
        <hibernate.version>4.3.5.Final</hibernate.version>
        <spring-data-jpa.version>1.6.0.RELEASE</spring-data-jpa.version>
        <spring-data-jpa.version>1.7.2.RELEASE</spring-data-jpa.version>
        <tomcat-jdbc.version>7.0.53</tomcat-jdbc.version>
        <sitemesh.version>2.4.2</sitemesh.version>
        <shiro.version>1.2.3</shiro.version>
@@ -82,6 +82,11 @@
            <artifactId>spring-context-support</artifactId>
            <version>${spring.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-expression</artifactId>
            <version>${spring.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>

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

@@ -36,14 +36,8 @@ public interface DoctorAdminTeamMemberDao extends
    @Query("SELECT d from Hospital h, Doctor d WHERE d.name like :doctorName " +
            "AND h.code = d.hospital AND h.code = :orgCode AND d.code not in " +
            "(select t.doctorCode from AdminTeamMember t WHERE t.teamId = :teamId)")
    Page<Doctor> findTeamExcludedMembersWithDoctorName(@Param(value = "orgCode") String orgCode,
                                                       @Param(value = "doctorName") String doctorName,
                                                       @Param(value = "teamId") long teamId,
                                                       Pageable pageable);
    @Query("SELECT d from Hospital h, Doctor d WHERE h.code = d.hospital AND h.code = :orgCode AND d.code not in " +
            "(select t.doctorCode from AdminTeamMember t WHERE t.teamId = :teamId)")
    Page<Doctor> findTeamExcludedMembers(@Param(value = "orgCode") String orgCode,
                                         @Param(value = "doctorName") String doctorName,
                                         @Param(value = "teamId") long teamId,
                                         Pageable pageable);
}

src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -162,14 +162,13 @@ public class AdminTeamService extends BaseService {
     */
    public List<Doctor> getExcludedMembers(String orgCode, String doctorName, long teamId, int page, int size) {
        Pageable pageable = new PageRequest(page, size);
        Page<Doctor> doctors;
        if (StringUtils.isEmpty(doctorName)) {
            doctors = memberDao.findTeamExcludedMembers(orgCode, teamId, pageable);
            doctorName = "%";
        } else {
            doctors = memberDao.findTeamExcludedMembersWithDoctorName(orgCode,
                    "%" + doctorName + "%", teamId, pageable);
            doctorName = "%" + doctorName + "%";
        }
        Page<Doctor> doctors = memberDao.findTeamExcludedMembers(orgCode, doctorName, teamId, pageable);
        if (doctors == null) return null;
        return doctors.getContent();
@@ -234,8 +233,7 @@ public class AdminTeamService extends BaseService {
        }
        Page<Patient> result = teamDao.getHealthDoctorSigningPatients(
                healthDoctorCode, generalDoctors,
                new PageRequest(page, size));
                healthDoctorCode, generalDoctors, new PageRequest(page, size));
        return result.getContent();
    }

src/main/java/com/yihu/wlyy/web/doctor/team/AdminTeamController.java

@@ -5,6 +5,7 @@ import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@RestController
@RequestMapping(value = "/doctor/admin-teams", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -213,8 +211,8 @@ public class AdminTeamController extends BaseController {
                simplified.put("code", patient.getCode());
                simplified.put("name", patient.getName());
                simplified.put("sex", patient.getSex());
                simplified.put("photo", patient.getPhone());
                simplified.put("birthday", patient.getBirthday());
                simplified.put("photo", patient.getPhoto());
                simplified.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));
                simplified.put("disease", patient.getDisease());
                simplifiedPatients.add(simplified);