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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -2297,11 +2297,15 @@ public class ConsultTeamService extends ConsultService {
                json.put("represented",p.getCode());//被代理人
                json.put("remark", "");
                json.put("consult", consult);
                String first = endName + "，您好！您有1条";;
                String first = name + "，您好！您有1条";;
                if(consultTeam.getType()==8){
                    first += "续方";
                }
                first += "咨询已结束，请及时对咨询医生进行评价。";
                if (endOperator.equals("admin")) {
                    first += "咨询超时未回复，系统自动关闭，请及时对咨询医生进行评价。";
                }else {
                    first += "咨询已结束，请及时对咨询医生进行评价。";
                }
                json.put("first", first);
                if(StringUtils.isNotBlank(p.getOpenid())){
                    pushMsgTask.putWxMsg(accessTokenUtils.getAccessToken(), 17, openId, p.getName(), json);