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

# Conflicts:
#	src/server/models/client/wechat.client.js

src/server/handlers/socket.handler.js

@@ -138,7 +138,7 @@ class SocketHandler {
                            clientCache.addClient(doctorClient);
                            //修改医生在线状态
                            let participants = new Participants();
                            participants.changUserRedisLoginStatus(original_login_userid,data.clientType,1,doctorClient.sessionId);
                            //participants.changUserRedisLoginStatus(original_login_userid,data.clientType,1,doctorClient.sessionId);
                            socket.emit('ack', {});
                        }
                    }
@@ -374,7 +374,7 @@ class SocketHandler {
                    }else{
                        //修改医生在线状态
                        let participants = new Participants();
                        participants.changUserRedisLoginStatus(patientClient.userId,patientClient.clientType,0,patientClient.sessionId);
                        //participants.changUserRedisLoginStatus(patientClient.userId,patientClient.clientType,0,patientClient.sessionId);
                    }
               /*     //通知会话的其他成员离线消息
                    if(patientClient.sessionId !=  "system"){

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

@@ -78,8 +78,10 @@ class WechatClient extends RedisModel {
            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.surveyMessage
            message.content_type== CONTENT_TYPES.Article||
            message.content_type==CONTENT_TYPES.surveyMessage||
            message.content_type==CONTENT_TYPES.PersonalCard||
            message.content_type==CONTENT_TYPES.Video
            )) {
            let patientClient = clientCache.findById(targetUserId);
            let pc_patientClient = clientCache.findById("pcpatient_"+targetUserId);
@@ -1011,11 +1013,11 @@ class WechatClient extends RedisModel {
                            consultTitle = "咨询回复提醒";
                            description  = topic.description;
                            if("xmijk" == config.imClientType.id){
                                url = "http://zb.xmtyw.cn/ims-wx/index.html#/chatRoom?type=1&consultCode="+topic.id;
                                url = "https://zb.xmtyw.cn/ims-wx/index.html#/chatRoom?type=1&consultCode="+topic.id;
                            }else if("zsyy" == config.imClientType.id){
                                url = "https://hlwyy.xmzsh.com/ims-wx/index.html#/chatRoom?type=1&consultCode="+topic.id;
                            }else if("xm_xzzx_wx" == config.imClientType.id){
                                url = "http://ih.xmheart.com/hlwyy/ims-wx/index.html#/chatRoom?type=1&consultCode="+topic.id;
                                url = "https://ih.xmheart.com/hlwyy/ims-wx/index.html#/chatRoom?type=1&consultCode="+topic.id;
                            }else{}
                    }