Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/doctor/team/admin/AdminTeamMember.java

@@ -19,6 +19,7 @@ public class AdminTeamMember extends IdEntity {
    private long teamId;
    private String doctorCode;
    private Date joinTime;
    private boolean available;
    public long getTeamId() {
        return teamId;
@@ -47,4 +48,13 @@ public class AdminTeamMember extends IdEntity {
    public void setJoinTime(Date joinTime) {
        this.joinTime = joinTime;
    }
    public boolean isAvailable() {
        return available;
    }
    @Column(name = "available")
    public void setAvailable(boolean available) {
        this.available = available;
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamMemberDao.java

@@ -6,6 +6,7 @@ import com.yihu.wlyy.entity.doctor.team.admin.AdminTeamMember;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
@@ -27,11 +28,11 @@ public interface DoctorAdminTeamMemberDao extends
    List<AdminTeam> findDoctorTeams(@Param(value = "doctorCode") String doctorCode);
    @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 t.available = true ORDER BY d.level")
            "AND m.doctorCode = d.code AND t.available = true AND m.available = true ORDER BY d.level")
    List<Doctor> findAllMembers(@Param(value = "teamId") long teamId);
    @Query("SELECT case when count(A) > 0 then true else false END FROM AdminTeamMember A WHERE A.teamId = :teamId " +
            "AND A.doctorCode = :doctorCode")
            "AND A.doctorCode = :doctorCode AND A.available = true")
    Boolean isMemberExist(@Param(value = "teamId") long teamId, @Param(value = "doctorCode") String doctorCode);
    @Query("SELECT d from Hospital h, Doctor d WHERE d.name like :doctorName " +
@@ -42,6 +43,10 @@ public interface DoctorAdminTeamMemberDao extends
                                         @Param(value = "teamId") long teamId,
                                         Pageable pageable);
    @Modifying
    @Query("UPDATE AdminTeamMember t SET t.available = false where t.id = :teamId and doctorCode = :doctorCode")
    void removeMember(@Param("teamId") long teamId, @Param("doctorCode") String doctorCode);
    @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 t.available = true and d.level != 1 ")
    List<Doctor> findAllHeathExcludeThis(long teamId, String doctorCode);

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

@@ -176,7 +176,7 @@ public class AdminTeamService extends BaseService {
     * @param doctorCode
     */
    public Pair<Integer, String> removeMember(long teamId, String doctorCode) {
        if (signingTeamMemberDao.isSanShiSigning(doctorCode)) {
        /*if (signingTeamMemberDao.isSanShiSigning(doctorCode)) {
            return new ImmutablePair<>(403, "三师签约医生，不能删除");
        }
@@ -195,10 +195,10 @@ public class AdminTeamService extends BaseService {
                    }
                }
            }
        }
        }*/
        AdminTeamMember member = memberDao.findByTeamIdAndDoctorCodeOrderByDoctorCodeAsc(teamId, doctorCode);
        if (member != null) memberDao.delete(member);
        if (member != null) memberDao.removeMember(teamId, doctorCode);
        return new ImmutablePair<>(200, "OK");
    }

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

@@ -69,7 +69,7 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/deletion", method = RequestMethod.POST)
    @RequestMapping(value = "/remove", method = RequestMethod.POST)
    @ApiOperation(value = "删除团队信息")
    public String deleteTeam(@RequestParam("teamId") long teamId){
        try {