Merge branch 'im-internet-hospital-oracle' of huangwenjie/im.doctor into im-internet-hospital-oracle

src/server/repository/oracle/message.repo.js

@@ -154,7 +154,7 @@ class MessageRepo {
        let sql =
            "SELECT S.\"CONTENT_TYPE\" as \"content_type\", S.\"CONTENT\" as \"content\",S.\"AGENT\" as \"agent\" FROM " + DB_TABLES.sessionTypeToTableName(sessionType) + " S " +
            "WHERE S.SESSION_ID = :SESSION_ID ORDER BY S.TIMESTAMP DESC rownum=1 ";
            "WHERE S.SESSION_ID = :SESSION_ID and  rownum=1 ORDER BY S.TIMESTAMP DESC ";
        log.info("获取会话医生的id sql : " + sql);
        log.info("获取会话医生的id args : " + [sessionId]);
        oracledbUtil.query({
@@ -170,7 +170,7 @@ class MessageRepo {
     * @param handler
     */
    static getWlyyMessageCount(user, handler) {
        let sql = "SELECT COUNT(1) as \"count\" FROM "+DB_TABLES.WlyyMessage+" A WHERE A.HAS_READ= 1 AND A.RECEIVER = ?";
        let sql = "SELECT COUNT(1) as \"count\" FROM "+DB_TABLES.WlyyMessage+" A WHERE A.HAS_READ= 1 AND A.RECEIVER = :RECEIVER";
        oracledbUtil.query({
            "sql": sql,
            "args": [user],

src/server/repository/oracle/participant.repo.js

@@ -186,7 +186,7 @@ class ParticipantRepo {
    }
    static findNameById(userId, handler) {
        let sql = "SELECT P.\"NAME\" as \"name\",P.\"SEX\" as \"sex\",P.\"BIRTHDATE\" as \"birthdate\" FROM PATIENTS P WHERE P.ID =? UNION SELECT D.NAME,D.SEX,D.BIRTHDATE FROM DOCTORS D WHERE D.ID =?";
        let sql = "SELECT P.\"NAME\" as \"name\",P.\"SEX\" as \"sex\",P.\"BIRTHDATE\" as \"birthdate\" FROM PATIENTS P WHERE P.ID =:ID UNION SELECT D.NAME,D.SEX,D.BIRTHDATE FROM DOCTORS D WHERE D.ID =:ID";
        oracledbUtil.query({
            "sql": sql,
            "args": [userId, userId],

src/server/repository/oracle/patient.repo.js

@@ -18,7 +18,7 @@ class PatientRepo {
    static findOne(patientId, handler){
        oracledbUtil.query({
            "sql": "SELECT \"ID\" AS \"id\",\"NAME\" AS \"name\",\"SEX\" AS \"sex\",\"BIRTHDATE\" AS \"birthdate\",\"AVATAR\" AS \"avatar\",\"OPENID\" AS \"openid\",\"IDCARD\" AS \"idcard\",\"MOBILE\" AS \"mobile\" FROM PATIENTS WHERE ID = ? ",
            "sql": "SELECT \"ID\" AS \"id\",\"NAME\" AS \"name\",\"SEX\" AS \"sex\",\"BIRTHDATE\" AS \"birthdate\",\"AVATAR\" AS \"avatar\",\"OPENID\" AS \"openid\",\"IDCARD\" AS \"idcard\",\"MOBILE\" AS \"mobile\" FROM PATIENTS WHERE ID = :ID ",
            "args": [patientId],
            "handler": handler
        });

src/server/repository/oracle/topics.repo.js

@@ -116,7 +116,7 @@ class TopicRepo {
                "S.\"AVATAR\" AS \"avatar\",S.\"SEX\" AS \"sex\",S.\"BIRTHDATE\" AS \"birthdate\",S.\"NAME\" AS \"patient_name\",C.\"DOCTOR\" AS \"doctor\" FROM "+
                DB_TABLES.Topics+" T,"+DB_TABLES.Participants+" P,"+DB_TABLES.Doctors+" D,"+DB_TABLES.WlyyConsult+" C,"+DB_TABLES.Patients+" S "+
                "WHERE D.ID = P.PARTICIPANT_ID AND C.ID = T.ID AND C.PATIENT = S.ID AND P.SESSION_ID = T.SESSION_ID "+
                "AND D.ID IN (:ID) AND T. STATUS = :STATUS AND T.REPLY=? AND C.TYPE NOT IN ('6','8') ORDER BY CREATE_TIME DESC ";
                "AND D.ID IN (:ID) AND T. STATUS = :STATUS AND T.REPLY=:REPLY AND C.TYPE NOT IN ('6','8') ORDER BY CREATE_TIME DESC ";
            sql += " AND rownum<="+size+") WHERE r>="+page+" ";
        }
        oracledbUtil.query({
@@ -238,7 +238,7 @@ class TopicRepo {
                "S.\"AVATAR\" AS \"avatar\",S.\"SEX\" AS \"sex\",S.\"BIRTHDATE\" AS \"birthdate\",S.\"NAME\" AS \"patient_name\",C.\"DOCTOR\" AS \"doctor\" FROM "+
                DB_TABLES.Topics+" T,"+DB_TABLES.Participants+" P,"+DB_TABLES.Doctors+" D,"+DB_TABLES.WlyyConsultTeam+" C,"+DB_TABLES.Patients+" S "+
                "WHERE D.ID = P.PARTICIPANT_ID AND C.CONSULT = T.ID AND C.PATIENT = S.ID AND P.SESSION_ID = T.SESSION_ID "+
                "AND C.ADMIN_TEAM_CODE =? AND D.ID IN (:ID) AND T. STATUS = :STATUS AND C.TYPE NOT IN ('6','8') ORDER BY CREATE_TIME DESC ";
                "AND C.ADMIN_TEAM_CODE =:ADMIN_TEAM_CODE AND D.ID IN (:ID) AND T. STATUS = :STATUS AND C.TYPE NOT IN ('6','8') ORDER BY CREATE_TIME DESC ";
            sql += " AND rownum<="+size+") WHERE r>="+page+" ";
        }else{
            args.push(adminTeamCode,userId,status,reply);
@@ -246,7 +246,7 @@ class TopicRepo {
                "S.\"AVATAR\" AS \"avatar\",S.\"SEX\" AS \"sex\",S.\"BIRTHDATE\" AS \"birthdate\",S.\"NAME\" AS \"patient_name\",C.\"DOCTOR\" AS \"doctor\" FROM "+
                DB_TABLES.Topics+" T,"+DB_TABLES.Participants+" P,"+DB_TABLES.Doctors+" D,"+DB_TABLES.WlyyConsultTeam+" C,"+DB_TABLES.Patients+" S "+
                "WHERE D.ID = P.PARTICIPANT_ID AND C.CONSULT = T.ID AND C.PATIENT = S.ID AND P.SESSION_ID = T.SESSION_ID "+
                "AND C.ADMIN_TEAM_CODE =? AND D.ID IN (?) AND T. STATUS = ? AND T.REPLY=? AND C.TYPE NOT IN ('6','8') ORDER BY CREATE_TIME DESC";
                "AND C.ADMIN_TEAM_CODE =:ADMIN_TEAM_CODE AND D.ID IN (:ID) AND T. STATUS = :STATUS AND T.REPLY=:REPLY AND C.TYPE NOT IN ('6','8') ORDER BY CREATE_TIME DESC";
            sql += " AND rownum<="+size+") WHERE r>="+page+" ";
        }
        oracledbUtil.query({
@@ -296,7 +296,7 @@ class TopicRepo {
    static findLastTopicStatusAndType(sessionId, handler) {
        let sqlTemp = "SELECT rownum r, \"ID\" as \"id\" FROM " + DB_TABLES.Topics + " WHERE  SESSION_ID = ? ORDER BY CREATE_TIME DESC ";
        let sqlTemp = "SELECT rownum r, \"ID\" as \"id\" FROM " + DB_TABLES.Topics + " WHERE  SESSION_ID = :SESSION_ID ORDER BY CREATE_TIME DESC ";
        let sql = "SELECT*FROM ( "+sqlTemp+" AND rownum<=1) WHERE r>=0"
        oracledbUtil.query({
            sql: sql,
@@ -313,7 +313,7 @@ class TopicRepo {
    static findTopicStatus(topicId, handler) {
        let sql = "SELECT \"ID\" as \"id\", \"NAME\" as \"name\", \"DESCRIPTION\" as \"description\", \"STATUS\" as \"status\",\"AGENT\" as \"agent\" FROM " + DB_TABLES.Topics + " WHERE ID = ?";
        let sql = "SELECT \"ID\" as \"id\", \"NAME\" as \"name\", \"DESCRIPTION\" as \"description\", \"STATUS\" as \"status\",\"AGENT\" as \"agent\" FROM " + DB_TABLES.Topics + " WHERE ID = :ID";
        oracledbUtil.query({
            sql: sql,