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

src/server/models/user/users.js

@@ -22,6 +22,9 @@ let Patient = require('./patient');
let Doctor = require('./doctor');
let Participants = require('../../models/sessions/participants');
//oracle工具类
let oracledbUtil = require('../../util/oracledb.util');
let redisConn = RedisClient.redisClient().connection;
let async = require('async');
let log = require('../../util/log');
@@ -355,8 +358,8 @@ class Users extends RedisModel {
    static isPatientId(userId, callback) {
        async.waterfall([
                function (callback) {
                    ImDb.execQuery({
                        "sql": "select case when count(*) > 0 then 1 else 0 end 'is_patient' from patients where id = :id",
                    oracledbUtil.query({
                        "sql": "SELECT CASE WHEN COUNT(ID)> 0 THEN 1 ELSE 0 END AS \"is_patient\" FROM PATIENTS WHERE ID= : ID",
                        "args": [userId],
                        "handler": function (err, res) {
                            if (err) {

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

@@ -24,9 +24,9 @@ class ParticipantRepo {
     * @param handler
     */
    static findAll(sessionId, handler) {
        let sql = "SELECT U.\"ID\" AS \"id\",U.\"NAME\" AS \"name\",U.\"SEX\" AS \"sex\",U.\"BIRTHDATE\" AS \"birthdate\",U.\"AVATAR\" AS \"avatar\",U.\"HOSPITAL_NAME\" AS \"hospital_name\",P.\"PARTICIPANT_ROLE ROLE\" AS \"participant_role\",0 AS \"is_patient\",P.\"LAST_FETCH_TIME\" AS \"last_fetch_time\",U.\"LEVEL\" AS \"level\",U.\"MOBILE\" AS \"mobile\" FROM sessions s, participants p, doctors u" +
        let sql = "SELECT U.\"ID\" AS \"id\",U.\"NAME\" AS \"name\",U.\"SEX\" AS \"sex\",U.\"BIRTHDATE\" AS \"birthdate\",U.\"AVATAR\" AS \"avatar\",U.\"HOSPITAL_NAME\" AS \"hospital_name\",P.\"PARTICIPANT_ROLE\" AS \"role\",0 AS \"is_patient\",P.\"LAST_FETCH_TIME\" AS \"last_fetch_time\",U.\"LEVEL\" AS \"level\",U.\"MOBILE\" AS \"mobile\" FROM sessions s, participants p, doctors u " +
            "WHERE S.ID = :ID AND S.ID = P.SESSION_ID AND P.PARTICIPANT_ID = U.ID UNION " +
            "SELECT U.\"ID\" AS \"id\",U.\"NAME\" AS \"name\",U.\"SEX\" AS \"sex\",U.\"BIRTHDATE\" AS \"birthdate\",U.\"AVATAR\" AS \"avatar\",U.\"HOSPITAL_NAME\" AS \"hospital_name\",P.\"PARTICIPANT_ROLE ROLE\" AS \"participant_role\",1 AS \"is_patient\",P.\"LAST_FETCH_TIME\" AS \"last_fetch_time\",0 AS \"level\",U.\"MOBILE\" AS \"mobile\" FROM sessions s, participants p, patients u " +
            "SELECT U.\"ID\" AS \"id\",U.\"NAME\" AS \"name\",U.\"SEX\" AS \"sex\",U.\"BIRTHDATE\" AS \"birthdate\",U.\"AVATAR\" AS \"avatar\",U.\"HOSPITAL_NAME\" AS \"hospital_name\",P.\"PARTICIPANT_ROLE\" AS \"role\",1 AS \"is_patient\",P.\"LAST_FETCH_TIME\" AS \"last_fetch_time\",'0' AS \"level\",U.\"MOBILE\" AS \"mobile\" FROM sessions s, participants p, patients u " +
            "WHERE S.ID = :ID AND S.ID = P.SESSION_ID AND P.PARTICIPANT_ID = U.ID";
        oracledbUtil.query({

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

@@ -23,7 +23,7 @@ class TopicRepo {
     */
    static findOne(topicId, handler) {
        let sql = "SELECT \"ID\" AS \"id\",\"SESSION_ID\" AS \"session_id\",\"NAME\" AS \"name\",\"CREATE_TIME\" AS \"create_time\",\"END_BY\" AS \"end_by\",\"END_TIME\" AS \"end_time\"," +
            "\"START_MESSAGE_ID\" AS \"start_message_id\",\"END_MESSAGE_ID\" AS \"end_message_id\",\"DESCRIPTION\" AS \"description\",\"STATUS\" AS \"status\"" + DB_TABLES.Topics + " WHERE ID = :ID";
            "\"START_MESSAGE_ID\" AS \"start_message_id\",\"END_MESSAGE_ID\" AS \"end_message_id\",\"DESCRIPTION\" AS \"description\",\"STATUS\" AS \"status\" FROM " + DB_TABLES.Topics + " WHERE ID = :ID";
        oracledbUtil.query({
            sql: sql,

src/server/util/oracledb.util.js

@@ -36,7 +36,7 @@ let query = function(options){
                    doRelease(connection);
                    return handler(err, result);
                }
                console.log(result);
                // console.log(result);
                if(!result.rows ||  result.rows.length == 0){
                    handler(null, result.rows);
                }else{
@@ -45,9 +45,9 @@ let query = function(options){
                        return result.metaData.reduce((p, key, i)=>
                        {
                            log.info("开始组装数据库返回值："+i)
                            // log.info("开始组装数据库返回值："+i)
                            p[key.name] = v[i];
                            log.info(p)
                            // log.info(p)
                            return p;
                        }, {})
                    }));