Merge branch 'master' of chenweida/esb into master

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceController.java

@@ -509,9 +509,11 @@ public class RsResourceController extends BaseController {
            String datasetId = request.getParameter("datasetId");
            String name = request.getParameter("name");
            String page = request.getParameter("page");
            String rsResourceImportDatasetDialogName = request.getParameter("rsResourceImportDatasetDialogName");
            String rows = request.getParameter("rows");
            params.put("datasetId", datasetId);
            params.put("name", name);
            params.put("rsResourceImportDatasetDialogName", rsResourceImportDatasetDialogName);
            params.put("page", page);
            params.put("rows", rows);
            return resourceService.getDataSet(params);

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

@@ -63,4 +63,6 @@ public interface IStdService {
    public List<StdMetaDataModel> metadatasAllVersionList(Map<String, Object> params) throws Exception;
    public List<StdDataSetModel> datasetsAllVersionList() throws Exception;
    public List datasetVersionListByName(String rsResourceImportDatasetDialogName)throws Exception;
}

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java

@@ -167,12 +167,14 @@ public class RsResourceServiceImpl implements IRsResourceService {
        DataGridResult re = new DataGridResult();
        if (StringUtils.isEmpty(params.get("datasetId"))) {
            if(params.get("name")!=null)
            {
                return resourceDatasetDao.getDataSet(params);
            }
            else {
                re.setDetailModelList(stdService.datasetsAllVersionList());
            if (params.get("rsResourceImportDatasetDialogName") != null) {
                re.setDetailModelList(stdService.datasetVersionListByName(params.get("rsResourceImportDatasetDialogName").toString()));
            } else {
                if (params.get("name") != null) {
                    return resourceDatasetDao.getDataSet(params);
                } else {
                    re.setDetailModelList(stdService.datasetsAllVersionList());
                }
            }
        } else {
            RsResourceDataset rd = resourceDatasetDao.getEntity(RsResourceDataset.class, (String) params.get("datasetId"));

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/StdService.java

@@ -166,4 +166,9 @@ public class StdService implements IStdService {
    public List<StdDataSetModel> datasetsAllVersionList() throws Exception {
        return stdDatasetService.getAllVersionDatasetList();
    }
    @Override
    public List datasetVersionListByName(String rsResourceImportDatasetDialogName) throws Exception {
        return stdDatasetService.datasetVersionListByName(rsResourceImportDatasetDialogName);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdDatasetService.java

@@ -537,5 +537,45 @@ public class StdDatasetService extends SQLGeneralDAO {
        }
    }
    public List datasetVersionListByName(String rsResourceImportDatasetDialogName) {
        try {
            String hql = "FROM StandardVersionModel WHERE publishTime is not null order by publishTime";
            Query query = getCurrentSession().createQuery(hql);
            List<StandardVersionModel> versionModelList = query.list();
            String sql = Constants.EMPTY;
            BeanTransformer transformer = new BeanTransformer(StdDataSetModel.class);
            for (StandardVersionModel versionModel : versionModelList) {
                SqlCreator sqlCreator = new SqlCreator(StdDataSetModel.class);
                StandardVersion version = new StandardVersion(versionModel.getVersion());
                sql = sql + sqlCreator.selectData(version.getDataSetTableName())  + Constants.UNION;
            }
            if (!StringUtil.isEmpty(sql)) {
                sql = sql.substring(0, sql.length() - Constants.UNION.length());
                SQLQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                sqlQuery.setResultTransformer(transformer);
                List<StdDataSetModel> modelList = sqlQuery.list();
                List<StdDataSetModel> distinctModelList = new ArrayList<>();
                Map<String, StdDataSetModel> datasetModelMap = new HashMap<>();
                for (StdDataSetModel model : modelList) {
                    datasetModelMap.put(model.getCode(), model);
                }
                for (String key : datasetModelMap.keySet()) {
                    StdDataSetModel s=datasetModelMap.get(key);
                    if(s.getName().contains(rsResourceImportDatasetDialogName)){
                        distinctModelList.add(datasetModelMap.get(key));
                    }
                }
                return distinctModelList;
            } else {
                return new ArrayList<>();
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new ApiException(ErrorCode.GetDataSetListFailed);
        }
    }
}

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceImportDatasetDialogJs.jsp

@@ -160,7 +160,7 @@
                width: 180, onClick: function (value) {
                    //rsResourceImportDatasetDialog.$leftDG.queryByText("name", value);
                    rsResourceImportDatasetDialog.$leftDG.set({
                        parms: {name:rsResourceImportDatasetDialog.$searchBtn.val()}
                        parms: {rsResourceImportDatasetDialogName:rsResourceImportDatasetDialog.$searchBtn.val()}
                    });
                    rsResourceImportDatasetDialog.$leftDG.reload();