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

src/server/repository/oracle/db/im.db.js

@@ -6,16 +6,16 @@
let configFile = require('../../../include/commons').CONFIG_FILE;
let config =  require('../../../resources/config/' + configFile);
let oracledb = require('oracledb')
let dbUtil = require('../../../util/db.util');
oracledb.poolMax = 100;
oracledb.poolMin = 1;
oracledb.poolPingInterval = 20;
oracledb.poolTimeout = 0;
// let oracledb = require('oracledb')
// let dbUtil = require('../../../util/db.util');
//
// oracledb.poolMax = 100;
// oracledb.poolMin = 1;
// oracledb.poolPingInterval = 20;
// oracledb.poolTimeout = 0;
// 初始化连接池
let pool = oracledb.createPool(config.imDbConfig);
// let pool = oracledb.createPool(config.imDbConfig);
class ImDb {
    constructor() {

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

@@ -17,7 +17,7 @@ class PatientRepo {
    }
    static findOne(patientId, handler){
        oracledbUtil.quer({
        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 = ? ",
            "args": [patientId],
            "handler": handler
@@ -27,7 +27,7 @@ class PatientRepo {
    static findWechatOpenId(code, handler) {
        var sql = "SELECT \"OPENID\" as \"openid\" FROM PATIENTS WHERE ID = :ID ";
        ImDb.execQuery({
        oracledbUtil.query({
            "sql": sql,
            "args": [code],
            "handler": handler
@@ -40,11 +40,11 @@ class PatientRepo {
     * @param handler
     */
    static findWechatOpenIds(code, handler){
        var sql = "SELECT M.FAMILY_MEMBER CODE,P.NAME,P.OPENID FROM WLYY.WLYY_PATIENT P,WLYY.WLYY_PATIENT_FAMILY_MEMBER M" +
        var sql = "SELECT M.\"FAMILY_MEMBER\" AS \"CODE\",P.\"NAME\" AS \"name\",P.\"OPENID\" AS \"openid\" FROM WLYY.WLYY_PATIENT P,WLYY.WLYY_PATIENT_FAMILY_MEMBER M" +
            "  WHERE M.PATIENT = :PATIENT AND M.FAMILY_MEMBER=P.CODE AND P.OPENID IS NOT NULL AND M.IS_AUTHORIZE = 1 " +
            " UNION ALL" +
            "  SELECT P.CODE,P.NAME,P.OPENID  FROM WLYY.WLYY_PATIENT P WHERE P.CODE = :CODE";
        ImDb.execQuery({
            "  SELECT P.\"NAME\" AS \"name\",P.\"OPENID\" AS \"openid\"  FROM WLYY.WLYY_PATIENT P WHERE P.CODE = :CODE";
        oracledbUtil.query({
            "sql": sql,
            "args": [code,code],
            "handler": handler
@@ -53,9 +53,9 @@ class PatientRepo {
    // TODO: 不能直接访问三师库
    static getPatientDoctorConsult(patient, doctor, handler) {
        var sql = "SELECT * FROM WLYY_CONSULT_TEAM WHERE PATIENT = ? AND DOCTOR = ? AND STATUS = 0 AND DEL = '1' ";
        var sql = "SELECT * FROM WLYY_CONSULT_TEAM WHERE PATIENT = :PATIENT AND DOCTOR = :DOCTOR AND STATUS = 0 AND DEL = '1' ";
        ImDb.execQuery({
        oracledbUtil.query({
            "sql": sql,
            "args": [patient, doctor],
            "handler": handler

src/server/repository/oracle/private.msg.repo.js

@@ -20,7 +20,7 @@ class PrivateMsgRepo {
     */
    static save(to, from, type, content, handler) {
        ImDb.execQuery({
            "sql": "INSERT INTO MSG_P2P (TO_UID,FROM_UID,TYPE,CONTENT) VALUES (?,?,?,?)",
            "sql": "INSERT INTO MSG_P2P (TO_UID,FROM_UID,TYPE,CONTENT) VALUES (:TO_UID,:FROM_UID,:TYPE,:CONTENT)",
            "args": [to, from, type, content],
            "handler": handler
        });