行政团队新增

src/doctor/models/doctor.js

@@ -459,7 +459,7 @@ class Doctor extends BaseModel {
            for (let i = 0; i < doctors.length; i++) {
                let doctor = doctors[i];
                //过滤结束的咨询
                if(doctor.last_content_type==7)continue;
                //if(doctor.last_content_type==7)continue;
                amount = doctor.new_msg_count+amount;
            }
            // 再获取医生间的组
@@ -472,7 +472,7 @@ class Doctor extends BaseModel {
                for (let i = 0; i < groups.length; i++) {
                    let group = groups[i];
                    //过滤结束的咨询
                    if(group.last_content_type==7)continue;
                    //if(group.last_content_type==7)continue;
                    amount =   group.new_msg_count+amount;
                }
                chats.doctor = amount;
@@ -486,7 +486,7 @@ class Doctor extends BaseModel {
                    for (let i = 0; i < patients.length; i++) {
                             let patient = patients[i];
                            //过滤结束的咨询
                             if(patient.last_content_type==7)continue;
                            // if(patient.last_content_type==7)continue;
                             patientAmount =patientAmount+ patient.new_msg_count;
                    }
@@ -501,7 +501,7 @@ class Doctor extends BaseModel {
                            // 过滤掉医生间的求助团队
                            if (group.group_type === 2) continue;
                            //过滤结束的咨询
                            if(group.last_content_type==7)continue;
                            //if(group.last_content_type==7)continue;
                            patientAmount = patientAmount+ group.new_msg_count;
                        }
                        chats.patient = patientAmount;

src/doctor/models/search.js

@@ -341,7 +341,8 @@ class Search extends BaseModel {
                        content: t.content,
                        type: t.type,
                        msg_id: t.msg_id,
                        groupType: t.group_type
                        groupType: t.group_type,
                        avatar:t.photo
                    };
                    data.push(message);
                }

src/doctor/repository/search.repo.js

@@ -183,7 +183,7 @@ module.exports.searchDoctorsContentDetail = function(userId,keyword,groupcode,ty
            imRepo.execQuery({
                "sql": p2psql,
                "args": [userId,groupcode,userId,groupcode,"%" + keyword + "%"],
                "args": [groupcode,userId,groupcode,userId,"%" + keyword + "%"],
                "handler": handler
            });
        }
@@ -196,16 +196,21 @@ module.exports.searchDoctorsContentDetail = function(userId,keyword,groupcode,ty
 */
module.exports.searchGroupDoctors = function(userId,keyword,handler){
    var sql ="SELECT g.`code`, g.`name`,g.type as group_type, (( SELECT group_concat(temp.member_name) FROM wlyy.wlyy_talk_group_member temp WHERE temp.group_code = g. CODE and  t.type<4 AND temp.member_name LIKE ? )) AS con " +
        "FROM msg_group w, wlyy.wlyy_talk_group g, wlyy.wlyy_talk_group_member t " +
        "WHERE w.to_gid = g.`code` and  t.type<4 " +
        "AND t.group_code = g. CODE " +
        "AND w.to_gid IN ( SELECT w1.group_code FROM wlyy.wlyy_talk_group_member w1 WHERE w1.member_code = ? ) " +
        "AND W.to_gid NOT IN (SELECT w1.group_code FROM wlyy.wlyy_talk_group_member w1 WHERE w1.group_code = g.code and  w1. STATUS = 1  AND w1.TYPE =4) "+
        "AND ( g.`name` LIKE ? OR t.member_name LIKE ?) " +
        "GROUP BY g. NAME, g.`code` order by w.msg_id desc";
            "FROM msg_group w, wlyy.wlyy_talk_group g, wlyy.wlyy_talk_group_member t " +
            "WHERE w.to_gid = g.`code` and  t.type<4 " +
            "AND t.group_code = g. CODE " +
            "AND w.to_gid IN ( SELECT w1.group_code FROM wlyy.wlyy_talk_group_member w1 WHERE w1.member_code = ? ) " +
            "AND W.to_gid NOT IN (SELECT w1.group_code FROM wlyy.wlyy_talk_group_member w1 WHERE w1.group_code = g.code and  w1. STATUS = 1  AND w1.TYPE =4) "+
            "AND ( g.`name` LIKE ? OR t.member_name LIKE ?) " +
            "GROUP BY g. NAME, g.`code` " +
            " UNION ALL" +
            " SELECT g.id CODE, g. NAME NAME, '1' AS group_type, " +
            "( SELECT group_concat(temp. NAME) FROM wlyy.wlyy_admin_team_member m1, wlyy.wlyy_doctor temp WHERE temp. CODE = m1.doctor_code AND m1.team_id = g.id AND temp.`name` LIKE ? ) AS con " +
            " FROM wlyy.wlyy_admin_team g, wlyy.wlyy_admin_team_member m, wlyy.wlyy_doctor d, msg_statistic ms " +
            " WHERE d. CODE = m.doctor_code AND m.team_id = g.id AND g.id = ms.from_gid AND ms.uid = ? AND ms.last_content_type IN (1, 2, 3, 5, 6) AND (d. NAME LIKE ? OR g. NAME LIKE ?) GROUP BY g.id, g. NAME";
    imRepo.execQuery({
        "sql": sql,
        "args": ["%" + keyword + "%",userId,  "%" + keyword + "%", "%" + keyword + "%"],
        "args": ["%" + keyword + "%",userId,  "%" + keyword + "%", "%" + keyword + "%", "%" + keyword + "%",userId, "%" + keyword + "%", "%" + keyword + "%"],
        "handler": handler
    });
}

src/doctor/repository/stats.msg.repo.js

@@ -50,6 +50,7 @@ exports.updatePrivateChatSummary = function (userId, peerId, from, type, content
    if (userId == from) {
        //userId  = from ,peerId = to from = from
        // 更新自身的统计信息
        var sql = "INSERT INTO msg_statistic (uid,uuid,from_uid,peer_uid,msg_type,last_content_type,last_content,new_msg_count) " +
            "VALUES (?,?,?,?,?,?,?,?) ON DUPLICATE KEY UPDATE peer_uid=?,last_content_type=?,last_content=?";
@@ -59,15 +60,29 @@ exports.updatePrivateChatSummary = function (userId, peerId, from, type, content
            "handler": handler
        });
    } else {
        var sql ="";
        if(type==7){//结束的咨询
            //userId  = to ,peerId = from, from = from
            sql = "INSERT INTO msg_statistic (uid,uuid,from_uid,peer_uid,msg_type,last_content_type,last_content) " +
                "VALUES (?,?,?,?,?,?,?) ON DUPLICATE KEY UPDATE peer_uid=?,last_content_type=?,last_content=?";
            // 更新对端的统计信息
            imRepo.execQuery({
                "sql": sql,
                "args": [userId, uuid, from, peerId, 1, type, content, peerId, type, content],
                "handler": handler
            });
        }else{
        //userId  = to ,peerId = from, from = from
        var sql = "INSERT INTO msg_statistic (uid,uuid,from_uid,peer_uid,msg_type,last_content_type,last_content,new_msg_count) " +
         sql = "INSERT INTO msg_statistic (uid,uuid,from_uid,peer_uid,msg_type,last_content_type,last_content,new_msg_count) " +
            "VALUES (?,?,?,?,?,?,?,?) ON DUPLICATE KEY UPDATE peer_uid=?,last_content_type=?,last_content=?,new_msg_count=new_msg_count+1";
        // 更新对端的统计信息
        imRepo.execQuery({
            "sql": sql,
            "args": [userId, uuid, from, peerId, 1, type, content, 1, peerId, type, content],
            "handler": handler
        });
            // 更新对端的统计信息
            imRepo.execQuery({
                "sql": sql,
                "args": [userId, uuid, from, peerId, 1, type, content, 1, peerId, type, content],
                "handler": handler
            });
        }
    }
};