Browse Source

修改数据集导入全部的的bug

chenweida 9 years ago
parent
commit
a48d4eed72

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

@ -206,7 +206,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
        List responseParasm = stdService.metadatasAllVersionList(paramsTemp);
        List responseParasm = stdService.metadatasAllVersionList(params);
        JSONArray array = JSONArray.fromObject(responseParasm);
        if (array.size() == 0) {
            throw new Exception("该数据集没有数据元");

+ 9 - 9
Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdMetadataService.java

@ -21,7 +21,6 @@ import com.yihu.ehr.standard.model.standard.StdDataSetModel;
import com.yihu.ehr.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
import com.yihu.ehr.standard.service.bo.StandardVersion;
import jdk.internal.org.objectweb.asm.Type;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
@ -49,7 +48,8 @@ public class StdMetadataService extends SQLGeneralDAO {
    }
    public List<StdMetaDataModel> getList(String stdVersion, Integer datasetId, String condition, String order, Integer limit, Integer offset) {
        try{
        try {
            Map<String, String> queryMap = RequestParamTransformer.parseJsonToMap(condition);
            Map<String, String> orderMap = RequestParamTransformer.parseJsonToMap(order);
            StandardVersion standardVersion = new StandardVersion(stdVersion);
@ -319,7 +319,7 @@ public class StdMetadataService extends SQLGeneralDAO {
            detailModelResult.setDetailModelList(detailModelList);
            detailModelResult.setTotalCount(detailModelList.size());
            return detailModelResult;
        }catch (Exception e) {
        } catch (Exception e) {
            return DetailModelResult.error("获取标准数据元下拉列表失败");
        }
    }
@ -354,7 +354,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                sqlQuery.setParameter("code", code);
                List<StdDataSetModel> modelList = sqlQuery.list();
                sql = Constants.EMPTY;
                Integer count =  1;
                Integer count = 1;
                Map<Integer, String> datasetIdMap = new HashMap<>();
                for (StdDataSetModel model : modelList) {
                    SqlCreator sqlMetadataCreator = new SqlCreator(StdMetaDataModel.class);
@ -370,8 +370,8 @@ public class StdMetadataService extends SQLGeneralDAO {
                    sql = sql.substring(0, sql.length() - Constants.UNION.length());
                    sqlQuery = getCurrentSession().createSQLQuery(sql);
                    sqlQuery.setResultTransformer(metadataTransformer);
                    for (int i=1; i<count; i++) {
                        sqlQuery.setParameter(i-1, datasetIdMap.get(i));
                    for (int i = 1; i < count; i++) {
                        sqlQuery.setParameter(i - 1, datasetIdMap.get(i));
                    }
                    List<StdMetaDataModel> metadataList = sqlQuery.list();
                    Map<String, StdMetaDataModel> meatadataModelMap = new HashMap<>();
@ -384,7 +384,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                }
                return distinctModelList;
            } else  {
            } else {
                return new ArrayList<>();
            }
        } catch (Exception e) {
@ -397,9 +397,9 @@ public class StdMetadataService extends SQLGeneralDAO {
        try {
            SqlCreator sqlCreator = new SqlCreator(AdapterMetadataModel.class);
            sqlCreator.equalCondition("id", stdMetadataId);
            String sql = sqlCreator.selectData("std_metadata_"+version);
            String sql = sqlCreator.selectData("std_metadata_" + version);
            Query query = getQuery(sqlCreator, sql);
            return (StdMetaDataModel)query.uniqueResult();
            return (StdMetaDataModel) query.uniqueResult();
        } catch (Exception e) {
            return null;
        }