diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
index 0a80f82..950be1b 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -692,7 +692,7 @@ public class ChatGroupController {
     public void getChatRecord(JSONArray rs,JSONObject jsonObject){
         JSONArray rsrjson=new JSONArray();
         //登录账号
-        String user_name=jsonObject.get("user_name").toString();
+        String user_name=null!=jsonObject.get("user_name")?jsonObject.get("user_name").toString():"";
         //1 环信管理员 2 医生 3 患者
         String type=jsonObject.get("type").toString();
         LymsChatgroup queryChatgroup=new LymsChatgroup();
@@ -741,7 +741,7 @@ public class ChatGroupController {
             reusltJsonObject.put("from",lymsChatgroup.getFromp());
             reusltJsonObject.put("to",lymsChatgroup.getHxgroupid());
             reusltJsonObject.put("type","groupchat");
-            reusltJsonObject.put("timestamp",lymsMessageList.get(0).getSendtime());
+            reusltJsonObject.put("timestamp",lymsMessageList.size()>0?lymsMessageList.get(0).getSendtime():null);
             for (Object r : rs) {
                 JSONObject rjson= (JSONObject) JSON.toJSON(r);
                 if (! rjson.get("to").toString().equals(lymsChatgroup.getHxgroupid())) {