Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/pom.xml

@@ -27,7 +27,7 @@
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.6</version>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>org.mongodb</groupId>
@@ -108,7 +108,11 @@
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3.0</version>
        </dependency>
        <dependency>
            <groupId>commons-dbutils</groupId>
            <artifactId>commons-dbutils</artifactId>
            <version>1.6</version>
        </dependency>
        <!--=============oracle驱动 end =============-->
        <!--jxl导出工具-->
        <dependency>

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java

@@ -29,10 +29,9 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    public String getVersion(String orgCode) throws Exception
    {
        try{
            String sql = "select IFNULL(b.version,'') from adapter_scheme a\n" +
                    "left join adapter_scheme_version b \n" +
                    "on a.id=b.scheme_id \n" +
                    "where a.adapter_publisher_org_code='"+orgCode+"' ORDER BY PUBLISH_TIME DESC LIMIT 1;";
            String sql = "select IFNULL(o.qlc_adapter_version,'') \n" +
                    "from system_organization o\n" +
                    "where o.code = '"+orgCode+"'";
            return super.scalarBySql(sql, String.class);
        }
        catch (Exception e)

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatapushService.java

@@ -112,6 +112,9 @@ public class DatapushService implements IDatapushService {
                    }
                }
                //org_code字段
                obj.put("RSCOM_ORG_CODE",orgCode);
                //MongoDB入库
                boolean b = mongo.insert(datasetCode,obj);