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

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

@@ -360,6 +360,7 @@ public class TalkGroupService extends BaseService {
                    objRe.put("fromUid",obj.getString("peer_uid"));
                    objRe.put("fromName",fromDoctor.getName());
                    objRe.put("fromLevel",fromDoctor.getLevel());
                    objRe.put("sex",fromDoctor.getSex());
                    objRe.put("lastContentType",obj.getInt("last_content_type"));
                    objRe.put("lastContent",new String(obj.getString("last_content").getBytes(),"utf-8"));
                    objRe.put("newMsgCount",obj.getInt("new_msg_count"));