解决冲突

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

@@ -1,8 +1,3 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 * <p>
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.service.app.consult;
import com.yihu.wlyy.entity.consult.Consult;
@@ -110,6 +105,12 @@ public class ConsultTeamService extends ConsultService {
    private MessageDao messageDao;
    @Autowired
    private PrescriptionDao prescriptionDao;
    @Autowired
    private PrescriptionLogService prescriptionLogService;
    @Autowired
    private ImUtill ImUtill;
    @Autowired
    private HttpClientUtil HttpClientUtil;
    @Autowired
    WeiXinAccessTokenUtils accessTokenUtils;

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

@@ -923,7 +923,7 @@ public class ConsultController extends WeixinBaseController {
            String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                    + "api/v1/chats/message";
            String reG = HttpUtil.sendGet(url, "id=" + logId + "&type=" + msgType);
            String reG = httpUtil.sendGet(url, "id=" + logId + "&type=" + msgType);
            JSONObject obj = null;
            if (!org.springframework.util.StringUtils.isEmpty(reG)) {
                obj = new JSONObject(new String(reG.getBytes(), "utf-8"));