浏览代码

代码修改

bing 4 年之前
父节点
当前提交
1fec97c109
共有 2 个文件被更改,包括 45 次插入62 次删除
  1. 1 1
      src/server/include/commons.js
  2. 44 61
      src/server/models/client/wechat.client.js

+ 1 - 1
src/server/include/commons.js

@ -162,7 +162,7 @@ const CONTENT_TYPES = {
    ChangeDoorCoachDoctor: 2203,//上门辅导服务-变更工单医生信息
    ChangeDoorCoachDoctor: 2203,//上门辅导服务-变更工单医生信息
    ChangeDoorCoachPackageItems:2204, //上门辅导服务-变更工单服务项信息
    ChangeDoorCoachPackageItems:2204, //上门辅导服务-变更工单服务项信息
    CoachInformedConsent:2205,//上门辅导服务 知情通知书
    CoachInformedConsent:2205,//上门辅导服务 知情通知书
    emergencyAssistance:40,//医疗云-紧急救助
    emergencyAssistance:40,//医疗云-紧急预警弹框
    typeToDescription: function (type, defaultDescription) {
    typeToDescription: function (type, defaultDescription) {
        if (CONTENT_TYPES.Image == type) {
        if (CONTENT_TYPES.Image == type) {
            return '[图片]';
            return '[图片]';

+ 44 - 61
src/server/models/client/wechat.client.js

@ -410,61 +410,41 @@ class WechatClient extends RedisModel {
        if(!doctorSYSTEMClient){
        if(!doctorSYSTEMClient){
            log.warn("target system doctor is not online!");
            log.warn("target system doctor is not online!");
        }else{
        }else{
            if (message.content_type==CONTENT_TYPES.emergencyAssistance){
                doctorSYSTEMClient.socket.emit('message', {
                    session_id:message.session_id,
                    sender_name: message.sender_name,
                    order_id:message.order_id,
                    type: message.content_type,
                    extend:message.extend
                });
            }else {
                doctorSYSTEMClient.socket.emit('message', {
                    id: message.id,
                    session_id: 'system',
                    sender_id: message.sender_id,
                    sender_name: message.sender_name,
                    content_type: 1,
                    content: {"socket_sms_type":4},
                    timestamp: ObjectUtil.timestampToLong(message.timestamp),
                    type: message.content_type,          // legacy support
                    name: message.sender_name,
                    patient_name:message.patient_name,
                    patient_age:message.patient_age,
                    patient_sex:message.patient_sex,
                    extend:message.extend
                });
            }
            doctorSYSTEMClient.socket.emit('message', {
                id: message.id,
                session_id: 'system',
                sender_id: message.sender_id,
                sender_name: message.sender_name,
                content_type: 1,
                content: {"socket_sms_type":4},
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                patient_name:message.patient_name,
                patient_age:message.patient_age,
                patient_sex:message.patient_sex,
                extend:message.extend
            });
        }
        }
        if(!doctorAPPSYSTEMClient){
        if(!doctorAPPSYSTEMClient){
            log.warn("target system app doctor is not online!");
            log.warn("target system app doctor is not online!");
        }else{
        }else{
            if (message.content_type+""==CONTENT_TYPES.emergencyAssistance){
                doctorAPPSYSTEMClient.socket.emit('message', {
                    session_id:message.session_id,
                    sender_name: message.sender_name,
                    order_id:message.order_id,
                    type: message.content_type,
                    extend:message.extend
                });
            }else {
                doctorAPPSYSTEMClient.socket.emit('message', {
                    id: message.id,
                    session_id: 'system',
                    sender_id: message.sender_id,
                    sender_name: message.sender_name,
                    content_type: 1,
                    content: {"socket_sms_type":4},
                    timestamp: ObjectUtil.timestampToLong(message.timestamp),
                    type: message.content_type,          // legacy support
                    name: message.sender_name,
                    patient_name:message.patient_name,
                    patient_age:message.patient_age,
                    patient_sex:message.patient_sex,
                    extend:message.extend
                });
            }
            doctorAPPSYSTEMClient.socket.emit('message', {
                id: message.id,
                session_id: 'system',
                sender_id: message.sender_id,
                sender_name: message.sender_name,
                content_type: 1,
                content: {"socket_sms_type":4},
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                patient_name:message.patient_name,
                patient_age:message.patient_age,
                patient_sex:message.patient_sex,
                extend:message.extend
            });
        }
        }
@ -493,14 +473,16 @@ class WechatClient extends RedisModel {
        if(!doctorSYSTEMClient){
        if(!doctorSYSTEMClient){
            log.warn("target system doctor is not online!");
            log.warn("target system doctor is not online!");
        }else{
        }else{
            if (message.content_type==CONTENT_TYPES.emergencyAssistance){
            if (message.content_type==CONTENT_TYPES.emergencyAssistance) {
                doctorSYSTEMClient.socket.emit('message', {
                doctorSYSTEMClient.socket.emit('message', {
                    session_id:message.session_id,
                    session_id: message.session_id,
                    sender_name: message.sender_name,
                    sender_name: message.sender_name,
                    sender_code:message.sender_code,
                    order_id:message.order_id,
                    content_notice: message.content_notice,
                    sender_code: message.sender_code,
                    OrderType: message.OrderType, //20紧急救助工单21上门预约工单22安防警报工单
                    order_id: message.order_id,
                    type: message.content_type,
                    type: message.content_type,
                    extend:message.extend
                    extend: message.extend
                });
                });
            }else {
            }else {
                doctorSYSTEMClient.socket.emit('message', {
                doctorSYSTEMClient.socket.emit('message', {
@ -520,18 +502,19 @@ class WechatClient extends RedisModel {
                });
                });
            }
            }
        }
        }
        if(!doctorAPPSYSTEMClient){
        if(!doctorAPPSYSTEMClient){
            log.warn("target system app doctor is not online!");
            log.warn("target system app doctor is not online!");
        }else{
        }else{
            if (message.content_type+""==CONTENT_TYPES.emergencyAssistance){
            if (message.content_type+""==CONTENT_TYPES.emergencyAssistance) {
                doctorAPPSYSTEMClient.socket.emit('message', {
                doctorAPPSYSTEMClient.socket.emit('message', {
                    session_id:message.session_id,
                    session_id: message.session_id,
                    sender_name: message.sender_name,
                    sender_name: message.sender_name,
                    sender_code:message.sender_code,
                    order_id:message.order_id,
                    content_notice: message.content_notice,
                    sender_code: message.sender_code,
                    OrderType: message.OrderType,
                    order_id: message.order_id,
                    type: message.content_type,
                    type: message.content_type,
                    extend:message.extend
                    extend: message.extend
                });
                });
            }else {
            }else {
                doctorAPPSYSTEMClient.socket.emit('message', {
                doctorAPPSYSTEMClient.socket.emit('message', {