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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -8,6 +8,7 @@ import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.consult.ConsultTeamDoctor;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroup;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroup;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
@@ -30,6 +31,7 @@ import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.PatientSickDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import com.yihu.wlyy.service.app.talk.TalkGroupService;
import com.yihu.wlyy.service.common.SMSService;
import com.yihu.wlyy.util.MD5;
import org.apache.commons.beanutils.converters.IntegerConverter;
@@ -97,6 +99,8 @@ public class DoctorInfoService extends BaseService {
    SMSService smsService;
    @Autowired
    DoctorWorkTimeService workTimeService;
    @Autowired
    TalkGroupService talkGroupService;
    /**
     * 获取医生的签约病人
@@ -420,7 +424,7 @@ public class DoctorInfoService extends BaseService {
    }
    @Transactional
    public Doctor getDoctor2ByParient(String parientCode, String consultCode) {
    public Doctor getDoctor2ByParient(String parientCode, String consultCode) throws Exception {
        //得到咨询的类别
        Consult consult = consultDao.findByCode(consultCode);
//		//查找病人所在的团队
@@ -430,8 +434,10 @@ public class DoctorInfoService extends BaseService {
        //得到全科医生
        Doctor doctor = doctorDao.findByCode(doctorTeamMember.getMemberCode());
        //判断全科医生是否已经加入讨论组
        ConsultTeamDoctor consultTeamDoctor = consultTeamDoctorDao.getByConsultCodeAndDoctorCode(consultCode, doctor.getCode());
        if (consultTeamDoctor != null) {
        //ConsultTeamDoctor consultTeamDoctor = consultTeamDoctorDao.getByConsultCodeAndDoctorCode(consultCode, doctor.getCode());
        //判断全科医生是否已经加入讨论组
        JSONObject talkGroup = talkGroupService.findConsultTalkGroup(consultCode);
        if (talkGroup != null) {
            return null;
        }
        return doctor;