yeshijie 4 anni fa
parent
commit
eca8a20ca1

+ 6 - 6
src/server/models/sessions/sessions.js

@ -132,7 +132,7 @@ class Sessions extends RedisModel {
        }
        function callBusinessType(sessionId) {
            if(type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || type ==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type ==SESSION_TYPES.ONDOOR_NURSING){
            if(type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION|| type == SESSION_TYPES.KANGFU || type ==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type ==SESSION_TYPES.ONDOOR_NURSING){
                callCreate(sessionId, SESSION_BUSINESS_TYPE.PATIENT);
            }else if(type==SESSION_TYPES.DISCUSSION||type==SESSION_TYPES.GROUP){
                callCreate(sessionId, SESSION_BUSINESS_TYPE.DOCTOR);
@ -147,7 +147,7 @@ class Sessions extends RedisModel {
            let createDate = new Date();
            Participants.saveParticipantsToRedis(sessionId, participantArray, createDate, function (res) {
                let sessionKey = RedisModel.makeRedisKey(REDIS_KEYS.Session, sessionId);
                if (type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || type ==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type ==SESSION_TYPES.ONDOOR_NURSING) {
                if (type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || type == SESSION_TYPES.KANGFU || type ==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type ==SESSION_TYPES.ONDOOR_NURSING) {
                    businessType = 2;
                }
                let session = {
@ -204,7 +204,7 @@ class Sessions extends RedisModel {
        //流程2-判断session的业务类型;
        function callBusinessType() {
            if(type==SESSION_TYPES.MUC||type==SESSION_TYPES.PRESCRIPTION
            if(type==SESSION_TYPES.MUC||type==SESSION_TYPES.PRESCRIPTION || type == SESSION_TYPES.KANGFU
                || type==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type==SESSION_TYPES.ONDOOR_NURSING){
                callCreateSession(SESSION_BUSINESS_TYPE.PATIENT);
            }else if(type==SESSION_TYPES.SPECIALISTGROUP||type==SESSION_TYPES.DISCUSSION){
@ -1190,7 +1190,7 @@ class Sessions extends RedisModel {
                                                if(users[j]==userId)continue;
                                                 WechatClient.sendAllRead(users[j],sessionId);
                                            }
                                        }else if(session.type == SESSION_TYPES.MUC || session.type == SESSION_TYPES.PRESCRIPTION || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING){
                                        }else if(session.type == SESSION_TYPES.MUC || session.type == SESSION_TYPES.PRESCRIPTION || session.type == SESSION_TYPES.KANGFU || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING){
                                            for(var j in users){
                                                if(users[j]==userId)continue;
                                                WechatClient.sendMucAllRead(users[j],userId,sessionId);
@ -1223,7 +1223,7 @@ class Sessions extends RedisModel {
                                                //通知对方自己已经读取数据
                                                WechatClient.sendAllRead(users[j],sessionId);
                                            }
                                        }else if(session.type == SESSION_TYPES.MUC || session.type == SESSION_TYPES.PRESCRIPTION || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING){
                                        }else if(session.type == SESSION_TYPES.MUC || session.type == SESSION_TYPES.PRESCRIPTION || session.type == SESSION_TYPES.KANGFU || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING){
                                            for(var j in users){
                                                if(users[j]==userId)continue;
                                                //如果是患者拉取数据告诉在线的医生患者已经读取数据
@ -1491,7 +1491,7 @@ class Sessions extends RedisModel {
                            });
                        });
                    }
                    if(sessionType == SESSION_TYPES.MUC || sessionType == SESSION_TYPES.PRESCRIPTION || sessionType == SESSION_TYPES.PRESCRIPTION_HOSPITAL || sessionType == SESSION_TYPES.ONDOOR_NURSING){
                    if(sessionType == SESSION_TYPES.MUC || sessionType == SESSION_TYPES.PRESCRIPTION || sessionType == SESSION_TYPES.KANGFU || sessionType == SESSION_TYPES.PRESCRIPTION_HOSPITAL || sessionType == SESSION_TYPES.ONDOOR_NURSING){
                        if(message.content_type == CONTENT_TYPES.PlainText ||
                           message.content_type == CONTENT_TYPES.Image ||
                           message.content_type == CONTENT_TYPES.Audio||

+ 2 - 1
src/server/models/sessions/topics.js

@ -265,7 +265,8 @@ class Topics extends RedisModel {
     */
    createTopic(topicName, topicId, sessionId, users, messages, sessionType) {
        let self = this;
        if (!sessionId && (sessionType == SESSION_TYPES.MUC|| sessionType == SESSION_TYPES.PRESCRIPTION || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING)) {
        if (!sessionId && (sessionType == SESSION_TYPES.MUC|| sessionType == SESSION_TYPES.PRESCRIPTION
            || sessionType == SESSION_TYPES.KANGFU || sessionType == SESSION_TYPES.PRESCRIPTION_HOSPITAL || sessionType == SESSION_TYPES.ONDOOR_NURSING)) {
            ModelUtil.emitOK(self.eventEmitter, {status: -1, message: "会话ID为空,请先生成会话ID"});
            return;
        }