浏览代码

oracle util 底层方法修改

huangwenjie 5 年之前
父节点
当前提交
a3c9d6dea2
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      src/server/repository/oracle/participant.repo.js
  2. 5 5
      src/server/repository/oracle/topics.repo.js

+ 1 - 1
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],

+ 5 - 5
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,