Merge branch 'feature-refactor' of http://192.168.1.220:10080/Amoy/im.doctor into feature-refactor

src/server/models/sessions/sessions.js

@@ -1573,7 +1573,9 @@ class Sessions extends RedisModel {
                        if(message.content_type == CONTENT_TYPES.PlainText ||
                           message.content_type == CONTENT_TYPES.Image ||
                           message.content_type == CONTENT_TYPES.Audio||
                           message.content_type == CONTENT_TYPES.Video){
                           message.content_type == CONTENT_TYPES.Video||
                           (sessionType == SESSION_TYPES.MUC&&message.content_type == 0)//MUC 医生提醒消息记录进已回复
                        ){
                            TopicRepo.findLastBySessionId(sessionId,function(err,res){
                                if(res&&res.length>0&&res[0].reply==0){
                                    TopicRepo.replyTopic(message.sender_id,message.id,res[0].id,function(err,res){
@@ -1717,6 +1719,21 @@ class Sessions extends RedisModel {
                }).catch(function (err) {
                    log.error(err);
                    return;
                }).then(function (res) {
                    //续方审核的系统消息也记录进已回复
                    if(sessionType == SESSION_TYPES.PRESCRIPTION&&message.content_type == CONTENT_TYPES.PrescriptionCheck){
                        TopicRepo.findLastBySessionId(sessionId,function(err,res){
                                if(res&&res.length>0&&res[0].reply==0){
                                    TopicRepo.replyTopic(message.sender_id,message.id,res[0].id,function(err,res){
                                        if(err){
                                            logger.error("update topic reply error");
                                        }else{
                                            logger.warn("update topic reply success");
                                        }
                                    });
                                }
                        })
                    }
                })
            } else {
                if (handler){ handler("用户不在此会话当中！", messageId);return;}