пре 8 година
родитељ
комит
898c0b5fb0

+ 14 - 4
src/doctor/models/doctor.js

@ -373,13 +373,23 @@ class Doctor extends BaseModel {
                                modelUtil.emitDbError(self.eventEmitter, 'Get group list with doctor failed', err);
                                return;
                            }
                            chats.system.appo = appo;
                            var appoArray=[];
                            var appolist={};
                            appolist.newMessageCount = appo.length;
                            appolist.lastContent = appo[0].lastContent;
                            appoArray.push(appolist);
                            chats.system.appo = appoArray;
                            smRepo.getSystemList(userId,function(err,sys){
                                if (err) {
                                    modelUtil.emitDbError(self.eventEmitter, 'Get group list with doctor failed', err);
                                    return;
                                }
                                chats.system.sysInfo = sys;
                                var sysarry=[];
                                var syslist={};
                                syslist.newMessageCount = sys.length;
                                syslist.lastContent = sys[0].lastContent;
                                sysarry.push(syslist)
                                chats.system.sysInfo = sysarry;
                                modelUtil.emitData(self.eventEmitter, chats);
                            })
                        })
@ -553,14 +563,14 @@ class Doctor extends BaseModel {
                            modelUtil.emitDbError(self.eventEmitter, 'Get chat list with patient failed', err);
                            return;
                        }else{
                            chats.appo  = res[0].newMessageCount;
                            chats.appo  = res.length;
                        }
                        smRepo.getSystemList(userId,function(err,res){
                            if (err) {
                                modelUtil.emitDbError(self.eventEmitter, 'Get chat list with patient failed', err);
                                return;
                            }else{
                                chats.sysInfo  = res[0].newMessageCount;
                                chats.sysInfo  = res.length;
                            }
                            modelUtil.emitData(self.eventEmitter, chats);
                        })

+ 2 - 2
src/doctor/repository/stats.msg.repo.js

@ -233,10 +233,10 @@ exports.getAppMsgAmount = function (userId, handler) {
                    }
                    //获取预约消息
                    smRepo.getAppoList(userId,function(err, res){
                        new_msg_count  = new_msg_count+res[0].newMessageCount;
                        new_msg_count  = new_msg_count+res.length;
                        //获取系统消息
                        smRepo.getSystemList(userId,function(err, res){
                            new_msg_count  = new_msg_count+res[0].newMessageCount;
                            new_msg_count  = new_msg_count+res.length;
                            return new_msg_count;
                        })
                    })

+ 2 - 2
src/doctor/repository/system.msg.repo.js

@ -12,7 +12,7 @@ exports.save = function(to, contentType, title, summary, content, handler) {
};
exports.getSystemList=function(userId, handler){
    let sql ="select count(1) as newMessageCount,max(m.content) as lastContent FROM ydf_message m  where  m.receiver = ? and m.sender<>? and m.type in(301,302,303,304,305) and m.readonly =1;";
    let sql ="select m.content as lastContent FROM ydf_message m  where  m.receiver = ? and m.sender<>? and m.type in(301,302,303,304,305) and m.readonly =1  order by m.czrq desc";
    imRepo.execQuery({
        "sql": sql,
        "args": [userId,userId],
@ -21,7 +21,7 @@ exports.getSystemList=function(userId, handler){
}
exports.getAppoList = function (userId, handler) {
    var sql="select count(1) as newMessageCount,max(m.content) as lastContent FROM ydf_message m,ydf_appointment a where m.appointment_id = a.id and a.`status` = 0 and m.type=201 and m.receiver = ? " ;
    var sql="select m.content as lastContent FROM ydf_message m,ydf_appointment a where m.appointment_id = a.id and a.`status` = 0 and m.type=201 and m.receiver = ?  order by m.czrq desc " ;
    imRepo.execQuery({
        "sql": sql,
        "args": [userId],