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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -4,9 +4,11 @@ import java.util.List;
import java.util.Map;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
import com.yihu.wlyy.service.app.consult.ConsultService;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import com.yihu.wlyy.service.app.talk.TalkGroupService;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.util.MessageType;
import io.swagger.annotations.Api;
@@ -58,6 +60,8 @@ public class DoctorConsultController extends WeixinBaseController {
    private DoctorWorkTimeService doctorWorkTimeService;
    @Autowired
    private ConsultService consultService;
    @Autowired
    private TalkGroupService talkGroupService;
    /**
     * 三师咨询列表查询
@@ -203,7 +207,23 @@ public class DoctorConsultController extends WeixinBaseController {
            return invalidUserException(e, -1, "查询失败！");
        }
    }
    @RequestMapping(value = "/hasTnvite")
    @ResponseBody
    public String hasTnvite(String groupCode) {
        try {
            JSONObject jo=new JSONObject();
            List<WlyyTalkGroupMember> wlyyTalkGroupMembers= talkGroupService.findTalkGroupMembers(groupCode);
            if(wlyyTalkGroupMembers.size()>2){
                jo.put("hasTnvite",1);//有邀请
            }else{
                jo.put("hasTnvite",0);//没邀请
            }
            return write(200, "查询成功", "list", jo);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "查询失败！");
        }
    }
    /**
     * 名医列表
     *