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

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

@@ -1620,6 +1620,16 @@ public class ConsultTeamService extends ConsultService {
            Patient p = patientDao.findByCode(endOperator);
            endName = p.getName();
            endId = p.getCode();
            String openId = p.getOpenid();
            JSONObject json = new JSONObject();
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            json.put("keyword1","满意度评价");
            json.put("keyword2",sdf.format(new Date()));
            json.put("toUser", p.getCode());
            json.put("remark", "");
            json.put("consult",consult);
            json.put("first", endName +"，您好！您有1条咨询已结束，请及时对咨询医生进行满意度评价。");
            PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 17, openId, p.getName(), json);
        } else {
            if (endOperator.equals("admin")) {
                endId = "system";

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

@@ -19,7 +19,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.WeixinBaseController;
/**
 * 患者端：视频咨询控制类
 * 患者端视频咨询控制类
 * 
 * @author George
 */