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/include/commons.js

@@ -110,6 +110,7 @@ const CONTENT_TYPES = {
    PrescriptionReject: 33, //处方驳回消息
    ConsultSuggest: 34, //咨询建议
    PayMessage: 35, //支付消息
    surveyMessage: 36, //问卷消息
    ReservationDoorCardInfo: 2101,//上门服务-预约工单卡片信息
    ChangeDoorCardInfo: 2102,//上门服务-修改工单卡片信息
    ChangeDoorDoctor: 2103,//上门服务-变更工单医生信息

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

@@ -78,7 +78,8 @@ 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.PersonalCard
                message.content_type== CONTENT_TYPES.Article||
                message.content_type==CONTENT_TYPES.surveyMessage
            )) {
            let patientClient = clientCache.findById(targetUserId);
            let pc_patientClient = clientCache.findById("pcpatient_"+targetUserId);
@@ -1016,7 +1017,9 @@ class WechatClient extends RedisModel {
                        message.content_type==CONTENT_TYPES.PersonalCard||
                        message.content_type==CONTENT_TYPES.MessageForward||
                        message.content_type==CONTENT_TYPES.PrescriptionSuggest||
                        message.content_type==CONTENT_TYPES.ConsultSuggest)){
                        message.content_type==CONTENT_TYPES.ConsultSuggest||
                        message.content_type==CONTENT_TYPES.Article||
                        message.content_type==CONTENT_TYPES.surveyMessage)){
                        log.info("内容类型122："+message.content_type);
                        let userName = map.get("name");
                        let idCard = map.get("idcard");