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

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

@@ -648,6 +648,16 @@ class WechatClient extends RedisModel {
                    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
                });
            }
        }
        ModelUtil.emitOK(self.eventEmitter, {status: 200});
        return;