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

src/server/include/commons.js

@@ -183,7 +183,8 @@ const CONTENT_TYPES = {
    emergencyAssistance:40,//医疗云-紧急预警弹框
    BirthdayToPatientAssistance:41,//医疗云-人文关怀(生日祝福)
    HealthIndexToPatientAssistance:42,//医疗云-设备体征测量弹框
    SystemMessagePushAssistance:999,// 系统推送消息统一 999
    SystemMessagePushAssistance:999,// 系统推送消息统一   999  Pad 使用
    DeviceMessagePushAssistance:991,// 设备消息统一推送   991  Pad 使用
    EmergencyAssistanceMessage:43,//云招呼-预警消息
    typeToDescription: function (type, defaultDescription) {
        if (CONTENT_TYPES.Image == type) {

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

@@ -634,6 +634,7 @@ class WechatClient extends RedisModel {
                    content: message.content,
                    relation_code:message.relation_code,
                    type: message.content_type,
                    audioUrl: message.audioUrl,
                    extend: message.extend
                });
            }
@@ -645,17 +646,30 @@ class WechatClient extends RedisModel {
                    relation_code:message.relation_code,
                    type: message.content_type,
                    content_notice:message.content_notice,
                    audioUrl: message.audioUrl,
                    extend: message.extend
                });
            }
            if(message.content_type+""==CONTENT_TYPES.SystemMessagePushAssistance){//系统消息推送
                patientSYSTEMClient.socket.emit('message',{
                    title:message.title,
                    type:message.type,
                    content: message.content,
                    content_type:message.content_type,
                    audioUrl: message.audioUrl,
                    extend: message.extend
                });
            }
            if(message.content_type+""==CONTENT_TYPES.SystemMessagePushAssistance){
            if (message.content_type+""==CONTENT_TYPES.DeviceMessagePushAssistance){//设备消息推送
                patientSYSTEMClient.socket.emit('message',{
                    title:message.title,
                    deviceSn:message.deviceSn,
                    type:message.type,
                    content: message.content,
                    content_type:message.content_type,
                    audioUrl: message.audioUrl,
                    extend: message.extend
                });
            }
        }

src/server/repository/mysql/session.repo.js

@@ -303,12 +303,12 @@ class SessionRepo {
        }else{
            sql = "select session_id from " + DB_TABLES.Participants + " w where w.participant_id = ? and participant_role ="+PARTICIPANT_ROLES.HOST+" group by w.session_id";
            sessionSQL =  "select * from "
                + DB_TABLES.Sessions + " s where s.id in(" + sql + ") and s.business_type = ? and s.status = ? limit "+page+","+pagesize;
                + DB_TABLES.Sessions + " s where s.id in(" + sql + ") and s.business_type in (?) and s.status = ? limit "+page+","+pagesize;
            log.info("findAllByTypeAndStatus: sql : "+sessionSQL);
            log.info("findAllByTypeAndStatus: args : "+[userId, businessType,status]);
            ImDb.execQuery({
                "sql": sessionSQL,
                "args": [userId, businessType,status],
                "args": [userId, businessType.split(","),status],
                "handler": handler || function (err, res) {
                    if(err) log.error(err);
                }