|
@ -333,9 +333,10 @@ public class TalkGroupService extends BaseService {
|
|
|
* 获取以上一对一聊天
|
|
|
*
|
|
|
* @param doctor
|
|
|
* @param doctorName
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONArray getOneToOneIm(String doctor) throws UnsupportedEncodingException {
|
|
|
public JSONArray getOneToOneIm(String doctor,String doctorName) throws UnsupportedEncodingException {
|
|
|
JSONArray result = null;
|
|
|
JSONArray resultArray = new JSONArray();
|
|
|
String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
|
|
@ -356,10 +357,18 @@ public class TalkGroupService extends BaseService {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
objRe.put("uid",obj.getString("uid"));
|
|
|
objRe.put("fromUid",obj.getString("peer_uid"));
|
|
|
if(!StringUtils.isEmpty(doctorName)){
|
|
|
if(!fromDoctor.getName().contains(doctorName)){
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
objRe.put("uid",obj.getString("uid") != null ? obj.getString("uid") :"");
|
|
|
objRe.put("fromUid",obj.getString("peer_uid") != null ? obj.getString("peer_uid") : "");
|
|
|
objRe.put("fromName",fromDoctor.getName());
|
|
|
objRe.put("fromLevel",fromDoctor.getLevel());
|
|
|
objRe.put("photo",StringUtils.isEmpty(fromDoctor.getPhoto())?"":fromDoctor.getPhoto());
|
|
|
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"));
|