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

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

@@ -797,13 +797,13 @@ public class ConsultController extends WeixinBaseController {
                    + "&message_end_id=" + consultModel.getStartMsgId() + (consultModel.getEndMsgId() != null ? ("&message_start_id=" + consultModel.getEndMsgId()) : ""));
            if (!org.springframework.util.StringUtils.isEmpty(re)) {
                result = new JSONObject(re);
                result = new JSONObject(new String(re.getBytes(),"utf-8"));
            }
            if (result != null && result.getInt("count") > 0) {
                JSONArray list = result.getJSONArray("records");
                for (int i = list.length() - 1; i >= 0; i--) {
                for (int i = 0; i < list.length(); i++) {
                    JSONObject obj = list.getJSONObject(i);
                    if (obj.getInt("contentType") == 5) {
@@ -838,6 +838,8 @@ public class ConsultController extends WeixinBaseController {
                }
            }
            // 返回结果
            return write(200, "查询成功", "list", jsonArray);
        } catch (Exception e) {