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

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

@@ -417,19 +417,19 @@ public class AdminTeamService extends BaseService {
     */
    public JSONArray findPatientDoctorTeam(String patient, String doctor) {
        JSONArray result = new JSONArray();
        SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
        //判断是不是患者签约团队的团队长
        AdminTeam doctorTeam =  teamDao.findByLeaderCode(doctor);
        SignFamily jtSign = signFamilyDao.findSignByPatient(patient, 2);
        if (ssSign != null&&ssSign.getAdminTeamId()!=null && (doctor.equals(ssSign.getDoctor())
                || doctor.equals(ssSign.getDoctorHealth()))) {
            AdminTeam team = getTeam(ssSign.getAdminTeamId());
            result.put(new JSONObject(team));
        //判断团队关系
        if(jtSign!=null&&doctorTeam!=null&&jtSign.getAdminTeamId().compareTo(doctorTeam.getId())==0){
            return result.put(new JSONObject(doctorTeam));
        }
        if (jtSign.getAdminTeamId()!=null&&jtSign != null && (doctor.equals(jtSign.getDoctor())
                || doctor.equals(jtSign.getDoctorHealth()))) {
        //判断签约关系
        if (jtSign.getAdminTeamId()!=null&&jtSign != null && (doctor.equals(jtSign.getDoctor()) || doctor.equals(jtSign.getDoctorHealth()))) {
            AdminTeam team = getTeam(jtSign.getAdminTeamId());
            if(ssSign == null || ssSign.getAdminTeamId() != jtSign.getAdminTeamId()) {
                result.put(new JSONObject(team));
            }
            result.put(new JSONObject(team));
        }
        return result;
    }