推模式采集BUG修改

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

@@ -26,12 +26,12 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
     * 通过机构代码获取版本号
     */
    @Override
    public String getVersion(String orgCode) throws Exception
    public String getVersionByQLC(String orgCode) throws Exception
    {
        try{
            String sql = "select IFNULL(o.qlc_adapter_version,'') \n" +
                    "from system_organization o\n" +
                    "where o.qlc_org_code = '"+orgCode+"'";
            String sql = "select version from adapter_scheme_version v"+
                         "left join system_organization o on o.qlc_adapter_version=v.id"+
                         "where o.qlc_org_code ='"+orgCode+"'";
            return super.scalarBySql(sql, String.class);
        }
        catch (Exception e)

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

@@ -18,7 +18,7 @@ public interface IDatacollectDao extends XSQLGeneralDAO {
    /**
     * 通过机构代码获取版本号
     */
    public String getVersion(String orgCode) throws Exception;
    public String getVersionByQLC(String orgCode) throws Exception;
    /**
     * 根据JobId获取Cron表达式

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

@@ -74,7 +74,7 @@ public class DatapushService implements IDatapushService {
    public Result pushData(String datasetCode,String dataString,String orgCode) throws Exception
    {
        //机构标准版本
        String version = datacollect.getVersion(orgCode);
        String version = datacollect.getVersionByQLC(orgCode);
        //通过标准数据集名称获取适配关系
        AdapterDatasetModel dataset = stdService.getDatasetByCode(version,datasetCode);
        String msg = "";