Merge branch 'im-internet-hospital' of http://192.168.1.220:10080/Amoy/im.doctor into im-internet-hospital

src/server/models/client/wechat.client.js

@@ -77,7 +77,7 @@ class WechatClient extends RedisModel {
            message.content_type == CONTENT_TYPES.PrescriptionReject ||
            message.content_type == CONTENT_TYPES.PrescriptionSuggest ||
            message.content_type == CONTENT_TYPES.ConsultSuggest ||
            message.content_type == CONTENT_TYPES.PayMessage||message.content_type == CONTENT_TYPES.Article
            message.content_type == CONTENT_TYPES.PayMessage
            )) {
            let patientClient = clientCache.findById(targetUserId);
            let pc_patientClient = clientCache.findById("pcpatient_"+targetUserId);

src/server/models/sessions/sessions.js

@@ -1484,20 +1484,16 @@ class Sessions extends RedisModel {
     */
    getSessionUnreadMessageCount(sessionId, userId, handler) {
        let self = this;
        log.info("sessionId"+sessionId);
        let messagesByTimestampKey = RedisModel.makeRedisKey(REDIS_KEYS.MessagesByTimestamp, sessionId);
        let participantsKey = RedisModel.makeRedisKey(REDIS_KEYS.SessionParticipants, sessionId);
        log.info("12321321"+messagesByTimestampKey);
        async.waterfall([
            // 此成员最后获取消息的时间
            function (callback) {
                try {
                    log.info("进入1231");
                    redis.zscoreAsync(participantsKey, userId)
                        .then(function (lastFetchTime) {
                            callback(null, lastFetchTime);
                        })
                    log.info("进入4321");
                }catch (e){
                    log.error(e);
                }
@@ -1505,7 +1501,6 @@ class Sessions extends RedisModel {
            },
            // 计算最后获取消息的时间之后到现在有多少条消息
            function (lastFetchTime, callback) {
                log.info("进入4");
                if (!lastFetchTime) lastFetchTime = 0;
                let now = new Date().getTime();
                redis.zcountAsync(messagesByTimestampKey, parseInt(lastFetchTime)+1, now)
@@ -1516,7 +1511,6 @@ class Sessions extends RedisModel {
                            ModelUtil.emitOK(self.eventEmitter, {count: count});
                        }
                    })
                log.info("进入5");
            }
        ], function (err, res) {
            if (err) {
@@ -1527,7 +1521,6 @@ class Sessions extends RedisModel {
                }
            }
        });
        log.info("最后1222")
    }
    /**
@@ -1608,6 +1601,7 @@ class Sessions extends RedisModel {
            }
            logger.info("session.js--1443--res[0].exist" + res[0].exist);
            log.info("message.sender_id=" + message.sender_id);
            log.info("message.content="+message.content);
            if ( res[0].exist || message.sender_id == "system") {
                redis.hmgetAsync(sessionKey, ["type", "name"]).then(function (res) {
                    sessionType = res[0];