Merge branch 'im-internet-hospital' of liubing/im.doctor into im-internet-hospital

src/server/models/sessions/sessions.js

@@ -643,9 +643,9 @@ class Sessions extends RedisModel {
                                    let participantsTimeJson = {};
                                    //成员名字
                                    let participantNames;
                                    let sql = "SELECT u.name   FROM  participants p, patients u " +
                                    let sql = "SELECT u.name,u.avatar   FROM  participants p, patients u " +
                                        "WHERE  p.session_id = ?  AND p.participant_id = u.id AND P.participant_id=? union "+
                                    " SELECT u.name   FROM  participants p, doctors u  " +
                                    " SELECT u.name,u.avatar   FROM  participants p, doctors u  " +
                                        " WHERE  p.session_id = ?  AND p.participant_id = u.id AND P.participant_id=? ";
                                    ImDb.execQuery({
                                        "sql": sql,
@@ -653,10 +653,11 @@ class Sessions extends RedisModel {
                                        "handler": function(err,participantNames){
                                            if(participantNames&&participantNames.length>0){
                                                participantsTimeJson["name"] = participantNames[0].name;
                                                participantsTimeJson["avatar"] = participantNames[0].avatar;
                                            }
                                        }
                                    });
                                    participantsTimeJson["id"] = participantsTimeArray[j];
                                    participantsTimeJson[participantsTimeArray[j]] = participantsTimeArray[j+1];
                                    participantsTime.push(participantsTimeJson);
                                }
@@ -1091,9 +1092,9 @@ class Sessions extends RedisModel {
                                    if(j%2!=0)continue;
                                    let participantsTimeJson = {};
                                    let participantNames;
                                    let sql = "SELECT u.name   FROM  participants p, patients u " +
                                    let sql = "SELECT u.name,u.avatar   FROM  participants p, patients u " +
                                        "WHERE  p.session_id = ?  AND p.participant_id = u.id AND P.participant_id=? union "+
                                        " SELECT u.name   FROM  participants p, doctors u  " +
                                        " SELECT u.name,u.avatar   FROM  participants p, doctors u  " +
                                        " WHERE  p.session_id = ?  AND p.participant_id = u.id AND P.participant_id=? ";
                                    ImDb.execQuery({
                                        "sql": sql,
@@ -1101,9 +1102,11 @@ class Sessions extends RedisModel {
                                        "handler": function(err,participantNames){
                                            if(participantNames&&participantNames.length>0){
                                                participantsTimeJson["name"] = participantNames[0].name;
                                                participantsTimeJson["avatar"] = participantNames[0].avatar;
                                            }
                                        }
                                    });
                                    participantsTimeJson["id"] = participantsTimeArray[j];
                                    participantsTimeJson[participantsTimeArray[j]] = participantsTimeArray[j+1];
                                    participantsTime.push(participantsTimeJson);
                                }