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

src/server/app.js

@@ -91,6 +91,7 @@ if(config.httpsOpen){
    server = require('http').createServer(app);
}
let io = require('socket.io').listen(server);
// let io = require('socket.io').listen(server,{path:"/mlw/im"}); //im子目录 nginx也需要修改
server.listen(config.serverPort);

src/server/include/commons.js

@@ -197,6 +197,11 @@ const CONTENT_TYPES = {
    KnowCommonQuestion:3001,//知识库-常见问题
    KnowCommonQuestions:3002,//知识库-常见问题集
    KnowCommonDict:3003,//知识库-字典
    KnowDeptDoctor:3004,//知识库-科室医生
    KnowSymptomsDisease:3005,//知识库-疾病症状
    KnowSymptomsDiseaseQ:3006,//知识库-疾病症状问题
    KnowSymptomsDiseaseA:3007,//知识库-疾病症状回答
    KnowCommonCustomer:3008,//知识库-客服欢迎
    typeToDescription: function (type, defaultDescription) {
        if (CONTENT_TYPES.Image == type) {
            return '[图片]';

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

@@ -92,7 +92,12 @@ class WechatClient extends RedisModel {
            message.content_type==CONTENT_TYPES.EmergencyAssistanceMessage||
            message.content_type==CONTENT_TYPES.KnowCommonQuestion||
            message.content_type==CONTENT_TYPES.KnowCommonQuestions||
            message.content_type==CONTENT_TYPES.KnowCommonDict
            message.content_type==CONTENT_TYPES.KnowCommonDict||
            message.content_type==CONTENT_TYPES.KnowDeptDoctor||
            message.content_type==CONTENT_TYPES.KnowSymptomsDisease||
            message.content_type==CONTENT_TYPES.KnowSymptomsDiseaseQ||
            message.content_type==CONTENT_TYPES.KnowSymptomsDiseaseA||
            message.content_type==CONTENT_TYPES.KnowCommonCustomer
            )) {
            let patientClient = clientCache.findById(targetUserId);
            let pc_patientClient = clientCache.findById("pcpatient_"+targetUserId);

src/server/models/sessions/sessions.js

@@ -350,7 +350,7 @@ class Sessions extends RedisModel {
                log.error(err);
                ModelUtil.emitError(self.eventEmitter, {message: err, status: -1}, null);
            } else if(res&&res.length>0){
                ModelUtil.emitOK(self.eventEmitter, {sessionId: res[0].id, status: 200});
                ModelUtil.emitOK(self.eventEmitter, {sessionId: res[0].id,sessionStatus:res[0].status, status: 200});
            }else {
                ModelUtil.emitOK(self.eventEmitter, {sessionId: '', status: 200});
            }