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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/talk/TalkGroupService.java

@@ -635,7 +635,7 @@ public class TalkGroupService extends BaseService {
        String sql = "select t.* from wlyy_admin_team t" +
                " join wlyy_admin_team_member m" +
                " on t.id = m.team_id" +
                " where m.doctor_code = ? limit " + page * pagesize + ":" + pagesize;
                " where m.doctor_code = ? limit " + page * pagesize + "," + pagesize;
        List<AdminTeam> teams = jdbcTemplate.query(sql, new Object[]{doctor}, new BeanPropertyRowMapper(AdminTeam.class));
        JSONArray teamArray = new JSONArray();
@@ -646,7 +646,7 @@ public class TalkGroupService extends BaseService {
                if (members != null && members.size() > 0) {
                    JSONArray memberArray = new JSONArray();
                    for (Doctor doc : members) {
                        JSONObject dJson = new JSONObject(doc);
                        JSONObject dJson = new JSONObject();
                        dJson.put("memberCode", doc.getCode());
                        dJson.put("memberName", doc.getName());
@@ -771,7 +771,7 @@ public class TalkGroupService extends BaseService {
     *
     * @param doctor     医生
     * @param type       搜索类型 1:居民 2: 医生
     * @param searchType 搜索类型 1:居民 2:居民聊天记录 3:医生 4:群聊 6:医生聊天记录
     * @param searchType 搜索类型 1:居民 2:居民聊天记录 3:医生 4:群聊 5:医生聊天记录
     * @param page       第几页
     * @param pagesize   页大小
     * @return

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -744,6 +744,7 @@ public class DoctorDiscussionGroupController extends BaseController {
            if (type != 1 && type != 2) {
                return error(-1, "类型错误");
            }
            page = page > 0 ? page - 1 : 0;
            JSONObject result = talkGroupService.getImList(getUID(), type, page, pagesize);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
@@ -791,7 +792,7 @@ public class DoctorDiscussionGroupController extends BaseController {
                           @RequestParam(required = true) int page,
                           @RequestParam(required = true) int pagesize) {
        try {
            page = page > 1 ? page - 1 : 0;
            page = page > 0 ? page - 1 : 0;
            JSONObject result = talkGroupService.searchIm(getUID(), filter,
                    type, searchType, page, pagesize);