Merge branch 'feature-1.2.6' of Amoy/im.doctor into dev

src/doctor/models/group.js

@@ -133,7 +133,7 @@ class GroupMessage extends BaseModel {
     */
    getMessages(groupId, memberId, contentType, msgStartId, msgEndId, count) {
        let self = this;
        gmRepo.findAllMessages(groupId, !contentType ? "1,2,3,5,6,8,9" : contentType, msgStartId, msgEndId, count, function (err, rows) {
        gmRepo.findAllMessages(groupId, !contentType ? "1,2,3,4,5,6,8,9" : contentType, msgStartId, msgEndId, count, function (err, rows) {
            if (err) {
                modelUtil.emitDbError(self.eventEmitter, 'Get group message failed', err);
                return;

src/doctor/models/patient.js

@@ -163,6 +163,8 @@ class Patient extends BaseModel {
                    break;
            }
            var symptoms = consult.symptoms && consult.symptoms.length > 50 ? (consult.symptoms.substr(0, 50) + "...") : consult.symptoms;
            var reply = replyContent && replyContent.length > 50 ? (replyContent.substr(0, 50) + "...") : replyContent;
            // 模板消息数据
            var msg = {
@@ -171,10 +173,10 @@ class Patient extends BaseModel {
                url: config.wechatConfig.baseUrl + "/wx/html/yszx/html/consulting-doctor.html?openid=" + openid +
                "&consult=" + consult.consult + "&toUser=" + message.to,
                data: {
                    first: {value: "您的健康咨询有新的回复", color: "#000000"}
                    first: {value: consult.name + "，您好！\n您的健康咨询有新的回复", color: "#000000"}
                    , remark: {value: "", color: "#000000"}
                    , keyword1: {value: consult.symptoms, color: "#000000"}
                    , keyword2: {value: replyContent, color: "#000000"}
                    , keyword1: {value: symptoms, color: "#000000"}
                    , keyword2: {value: reply, color: "#000000"}
                    , keyword3: {value: name, color: "#000000"}
                }
            };