Merge branch 'master' of zlf/esb into master

Hos-Framework/src/main/java/com/yihu/ehr/framework/common/dao/SQLGeneralDAO.java

@@ -285,7 +285,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
            if (limit != null) {
                criteria.setMaxResults(limit);
                if (offset != null) {
                    criteria.setFirstResult(offset);
                    criteria.setFirstResult((offset - 1) * limit);
                }
            }
            return criteria.list();
@@ -329,7 +329,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
            if (limit != null) {
                criteria.setMaxResults(limit);
                if (offset != null) {
                    criteria.setFirstResult(offset);
                    criteria.setFirstResult((offset - 1) * limit);
                }
            }
            return criteria.list();

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/adapter/AdapterDict.java

@@ -32,33 +32,33 @@ public class AdapterDict {
        return adapterDictModel != null;
    }
    public String getStdDictEntryCodeByValue(String adapterEntryValue) {
    public String getEhrDictEntryCodeByValue(String esbDictEntryValue) {
        Map<String,String> condition = new HashMap<String,String>();
        condition.put("adapterDictId", StringUtil.toString(adapterDictModel.getId()));
        condition.put("adapterEntryValue", adapterEntryValue);
        condition.put("stdDictId", StringUtil.toString(adapterDictModel.getStdDictId()));
        condition.put("stdEntryValue", esbDictEntryValue);
        JSONObject jsonpObject = JSONObject.fromObject(condition);
        AdapterDictEntryService adapterDictEntryService = SpringBeanUtil.getService(AdapterDictEntryService.BEAN_ID);
        List<AdapterDictEntryModel> adapterDictEntryModelList = adapterDictEntryService.getList(AdapterDictEntryModel.class, adapterVersion.getDictEntryTableName(), jsonpObject.toString(), null, null, null, null);
        if (!CollectionUtil.isEmpty(adapterDictEntryModelList)) {
            String stdDictEntryCode = adapterDictEntryModelList.get(0).getStdEntryCode();
            if (!StringUtil.isEmpty(stdDictEntryCode)) {
                return stdDictEntryCode;
            String ehrDictEntryCode = adapterDictEntryModelList.get(0).getAdapterEntryCode();
            if (!StringUtil.isEmpty(ehrDictEntryCode)) {
                return ehrDictEntryCode;
            }
        }
        return new String(INVALID_ADAPTER_DICT);
    }
    public String getStdDictEntryCodeByCode(String adapterEntryCode) {
    public String getEhrDictEntryCodeByCode(String esbDictEntryCode) {
        Map<String,String> condition = new HashMap<String,String>();
        condition.put("adapterDictId", StringUtil.toString(adapterDictModel.getId()));
        condition.put("adapterEntryCode", adapterEntryCode);
        condition.put("stdDictId", StringUtil.toString(adapterDictModel.getStdDictId()));
        condition.put("stdEntryCode", esbDictEntryCode);
        JSONObject jsonpObject = JSONObject.fromObject(condition);
        AdapterDictEntryService adapterDictEntryService = SpringBeanUtil.getService(AdapterDictEntryService.BEAN_ID);
        List<AdapterDictEntryModel> adapterDictEntryModelList = adapterDictEntryService.getList(AdapterDictEntryModel.class, adapterVersion.getDictEntryTableName(), jsonpObject.toString(), null, null, null, null);
        if (!CollectionUtil.isEmpty(adapterDictEntryModelList)) {
            String stdDictEntryCode = adapterDictEntryModelList.get(0).getStdEntryCode();
            if (!StringUtil.isEmpty(stdDictEntryCode)) {
                return stdDictEntryCode;
            String ehrDictEntryCode = adapterDictEntryModelList.get(0).getAdapterEntryCode();
            if (!StringUtil.isEmpty(ehrDictEntryCode)) {
                return ehrDictEntryCode;
            }
        }
        return new String(INVALID_ADAPTER_DICT);

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

@@ -224,7 +224,7 @@ public class DataCollectDispatcher {
                AdapterMetadataModel adapterMetadataModel = adapterMetaData.getAdapterMetadataModel();
                String orgMetaDataCode = adapterMetadataModel.getAdapterMetadataCode();
                String stdMetaDataCode = adapterMetadataModel.getStdMetadataCode();
                jsonNode.put(stdMetaDataCode, dataNode.path(orgMetaDataCode).asText());
                jsonNode.put(orgMetaDataCode, dataNode.path(stdMetaDataCode).asText());
            }
            result.add(jsonNode);
        }

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

@@ -115,26 +115,26 @@ public class DataSetTransformer {
    /**
     * @param adapterDataSet 数据集编码
     * @param code        数据元编码
     * @param data        数据
     * @param esbData        数据
     * @return String 标准值
     * @modify 2015.09.16 airhead 增加值与编码转换
     */
    public String transferElem(AdapterDataSet adapterDataSet, String code, String data) {
    public String transferElem(AdapterDataSet adapterDataSet, String code, String esbData) {
        Map<String, AdapterMetaData> adapterMetaDataMap = adapterDataSet.getAdapterMetaDataMap();
        AdapterMetaData adapterMetaData = adapterMetaDataMap.get(code);
        AdapterDict adapterDict = adapterMetaData.getAdapterDict();
        if (adapterDict == null) {
            return data;
            return esbData;
        }
        String stdData = null;
        String ehrData = null;
        DictDataType adapterDictDataType = adapterMetaData.getAdapterDictDataType();
        if (adapterDictDataType == DictDataType.VALUE) {
            stdData = adapterDict.getStdDictEntryCodeByValue(data);
            ehrData = adapterDict.getEhrDictEntryCodeByValue(esbData);
        } else if (adapterDictDataType == DictDataType.CODE) {
            stdData = adapterDict.getStdDictEntryCodeByCode(data);
            ehrData = adapterDict.getEhrDictEntryCodeByCode(esbData);
        }
        return stdData;
        return ehrData;
    }
    /**

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

@@ -54,7 +54,7 @@ public class AdapterController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return adapterSchemeService.getEntityList(AdapterSchemeModel.class, condition, order, rows, page - 1, ErrorCode.GetSchemeListFailed);
        return adapterSchemeService.getEntityList(AdapterSchemeModel.class, condition, order, rows, page, ErrorCode.GetSchemeListFailed);
    }
    /**
@@ -130,7 +130,7 @@ public class AdapterController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StandardModel> standardModelList = standardService.getList(condition, order, rows, page - 1);
        List<StandardModel> standardModelList = standardService.getList(condition, order, rows, page);
        DictionaryResult dictionaryResult = new DictionaryResult();
        List<DictItem> detailModelList = new ArrayList<DictItem>();
        for(StandardModel standardModel : standardModelList){
@@ -153,8 +153,6 @@ public class AdapterController extends BaseController {
    @RequestMapping(value = "/getVersions")
    @ApiOperation(value = "获取标准版本列表", response = DictionaryResult.class, produces = "application/json", notes = "获取标准版本列表")
    public DictionaryResult getVersionList(
            @ApiParam(name = "apiVersion", value = "API版本号", defaultValue = "v1.0")
            @PathVariable(value = "apiVersion") String apiVersion,
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId,
            @ApiParam(name = "condition", value = "Must be Json")
@@ -165,7 +163,7 @@ public class AdapterController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StandardVersionModel> standardVersionModelList = standardVersionService.getList(standardId, condition, order, rows, page - 1);
        List<StandardVersionModel> standardVersionModelList = standardVersionService.getVersionList(standardId, condition, order, rows, page);
        DictionaryResult dictionaryResult = new DictionaryResult();
        List<DictItem> detailModelList = new ArrayList<DictItem>();
        for(StandardVersionModel standardVersionModel : standardVersionModelList){
@@ -196,7 +194,7 @@ public class AdapterController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<SystemOrganization> stdPublisherModelList = stdPublisherService.getList(condition, order, rows, page - 1);
        List<SystemOrganization> stdPublisherModelList = stdPublisherService.getList(condition, order, rows, page);
        DictionaryResult dictionaryResult = new DictionaryResult();
        List<DictItem> detailModelList = new ArrayList<DictItem>();
        for(SystemOrganization systemOrganization : stdPublisherModelList){

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

@@ -117,7 +117,7 @@ public class AdapterVersionController extends BaseController {
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<AdapterSchemeVersionModel> adapterSchemeVersionModelList = adapterSchemeVersion.getEntityListByParentId(
                AdapterSchemeVersionModel.class, "schemeId", schemeId, condition, order, rows, page - 1, ErrorCode.GetSchemeVersionListFailed);
                AdapterSchemeVersionModel.class, "schemeId", schemeId, condition, order, rows, page, ErrorCode.GetSchemeVersionListFailed);
        DictionaryResult dictionaryResult = new DictionaryResult();
        List<DictItem> detailModelList = new ArrayList<DictItem>();
        DictItem item = new DictItem();

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

@@ -53,7 +53,7 @@ public class SchemeDatasetController extends BaseController {
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<AdapterDatasetModel> dataSetModelList = datasetService.getDatasetList(AdapterDatasetModel.class, adapterVersion, condition, order, rows, page - 1);;
        List<AdapterDatasetModel> dataSetModelList = datasetService.getDatasetList(AdapterDatasetModel.class, adapterVersion, condition, order, rows, page);
        Integer count = datasetService.getDatasetInt(AdapterDatasetModel.class, adapterVersion, condition);
        Result result = new Result();
        result.setDetailModelList(dataSetModelList);

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

@@ -49,7 +49,7 @@ public class SchemeDictController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<AdapterDictModel> dictModelList = dictService.getDictList(AdapterDictModel.class, adapterVersion, condition, order, rows, page - 1);
        List<AdapterDictModel> dictModelList = dictService.getDictList(AdapterDictModel.class, adapterVersion, condition, order, rows, page);
        Integer count = dictService.getDictInt(AdapterDictModel.class, adapterVersion, condition);
        Result result = new Result();

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

@@ -50,7 +50,7 @@ public class SchemeDictEntryController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) throws Exception{
        List<AdapterDictEntryResultDetailModel> detailModelList = dictentryService.getDictEntryList(AdapterDictEntryModel.class, adapterVersion, condition, order, rows, page - 1);
        List<AdapterDictEntryResultDetailModel> detailModelList = dictentryService.getDictEntryList(AdapterDictEntryModel.class, adapterVersion, condition, order, rows, page);
        Integer count = dictentryService.getDictEntryInt(AdapterDictEntryModel.class, adapterVersion, condition);
        Result result = new Result();
        result.setDetailModelList(detailModelList);

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

@@ -49,7 +49,7 @@ public class SchemeMetadataController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page)  throws Exception{
        List<ApiMetadataResultDetailModel> metadataModelList = metadataService.getMetadataList(AdapterMetadataModel.class, adapterVersion, condition, order, rows, page - 1);
        List<ApiMetadataResultDetailModel> metadataModelList = metadataService.getMetadataList(AdapterMetadataModel.class, adapterVersion, condition, order, rows, page);
        Integer count = metadataService.getMetadataCount(AdapterMetadataModel.class, adapterVersion, condition);
        Result result = new Result();
        result.setDetailModelList(metadataModelList);

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

@@ -119,7 +119,7 @@ public class StandardVersionController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StandardVersionModel> standardVersionModelList = standardVersionService.getList(standardId, condition, order, rows, page - 1);
        List<StandardVersionModel> standardVersionModelList = standardVersionService.getVersionList(standardId, condition, order, rows, page);
        DictionaryResult dictionaryResult = new DictionaryResult();
        List<DictItem> detailModelList = new ArrayList<DictItem>();
        DictItem item = new DictItem();

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

@@ -51,7 +51,7 @@ public class StdDatasetController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StdDataSetModel> dataSetModelList = stdDatasetService.getDatasetList(StdDataSetModel.class, stdVersion, condition, order, rows, page - 1);
        List<StdDataSetModel> dataSetModelList = stdDatasetService.getDatasetList(StdDataSetModel.class, stdVersion, condition, order, rows, page);
        Integer count = stdDatasetService.getDatasetInt(StdDataSetModel.class, stdVersion, condition);
        Result result = new Result();
        result.setDetailModelList(dataSetModelList);

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

@@ -51,7 +51,7 @@ public class StdDictController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StdDictionaryModel> dictModelList = stdDictService.getDictList(StdDictionaryModel.class, stdVersion, condition, order, rows, page - 1);
        List<StdDictionaryModel> dictModelList = stdDictService.getDictList(StdDictionaryModel.class, stdVersion, condition, order, rows, page);
        Integer count = stdDictService.getDictInt(StdDictionaryModel.class, stdVersion, condition);
        Result result = new Result();
        result.setDetailModelList(dictModelList);
@@ -100,8 +100,8 @@ public class StdDictController extends BaseController {
    }
    @RequestMapping(value="/getDictCodeValues")
    @ApiOperation(value = "获取字典下拉框信息", response = String.class, produces = "application/json", notes = "获取字典下拉框信息")
    public String getSelectList(
    @ApiOperation(value = "获取字典下拉框信息", response = Result.class, produces = "application/json", notes = "获取字典下拉框信息")
    public Result getSelectList(
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "q", value = "数据集名称或编码", required = false)
@@ -127,6 +127,6 @@ public class StdDictController extends BaseController {
        List<Select2> detailModelList = stdDictService.getDictSelectList(dictList);
        Result result = getResult(detailModelList, detailModelList.size(), 1, rows);
        return result.toJson();
        return result;
    }
}

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

@@ -58,8 +58,8 @@ public class StdDictEntryController extends BaseController {
        if(dictId==null){//没有字典数据时，返回空数据
            return result;
        }
        List<StdDictionaryEntryModel> detailModelList = stdDictEntryService.getDictEntryList(StdDictionaryEntryModel.class, stdVersion, dictId, condition, order, rows, page - 1);
        Integer count = stdDictEntryService.getDictEntryInt(StdDictionaryEntryModel.class, stdVersion, dictId, condition, order, rows, page - 1);
        List<StdDictionaryEntryModel> detailModelList = stdDictEntryService.getDictEntryList(StdDictionaryEntryModel.class, stdVersion, dictId, condition, order, rows, page);
        Integer count = stdDictEntryService.getDictEntryInt(StdDictionaryEntryModel.class, stdVersion, dictId, condition);
        result.setDetailModelList(detailModelList);
        result.setTotalCount(count);
        return result;

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

@@ -61,7 +61,7 @@ public class StdMetadataController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StdMetaDataModel> metadataModelList = stdMetadataService.getMetadataList(StdMetaDataModel.class, stdVersion, datasetId, condition, order, rows, page - 1);
        List<StdMetaDataModel> metadataModelList = stdMetadataService.getMetadataList(StdMetaDataModel.class, stdVersion, datasetId, condition, order, rows, page);
        Integer count = stdMetadataService.getMetadataCount(StdMetaDataModel.class, stdVersion, datasetId, condition);
        Result result = new Result();
        result.setDetailModelList(metadataModelList);
@@ -114,8 +114,8 @@ public class StdMetadataController extends BaseController {
    }
    @RequestMapping(value="/getMetadataCodeValues")
    @ApiOperation(value = "获取数据元下拉框信息", response = String.class, produces = "application/json", notes = "获取机构数据元下拉框信息")
    public String getSelectList(
    @ApiOperation(value = "获取数据元下拉框信息", response = Result.class, produces = "application/json", notes = "获取机构数据元下拉框信息")
    public Result getSelectList(
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
@@ -143,7 +143,7 @@ public class StdMetadataController extends BaseController {
        List<StdMetaDataModel> metadataList = stdMetadataService.getMetadataList(StdMetaDataModel.class, stdVersion, datasetId, jsonpObject.toString(), order, rows, 0);
        List<Select2> detailModelList = stdMetadataService.getMetadataSelectList(metadataList);
        Result result = getResult(detailModelList, detailModelList.size(), 1, rows);
        return result.toJson();
        return result;
    }
    /**
@@ -165,7 +165,7 @@ public class StdMetadataController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        List<StdDictionaryModel> stdDictionaryModelList = stdDictService.getList(stdVersion, condition, order, rows, page - 1);
        List<StdDictionaryModel> stdDictionaryModelList = stdDictService.getList(stdVersion, condition, order, rows, page);
        DictionaryResult dictionaryResult = new DictionaryResult();
        List<DictItem> detailModelList = new ArrayList<DictItem>();
        DictItem item = new DictItem();

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

@@ -111,7 +111,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            if (limit != null) {
                query.setMaxResults(limit);
                if (offset != null) {
                    query.setFirstResult(offset * limit);
                    query.setFirstResult((offset - 1) * limit);
                }
            }
            return query.list();

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

@@ -122,7 +122,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult(offset * limit);
                query.setFirstResult((offset - 1) * limit);
            }
        }
        List<AdapterDictEntryModel> modelList = query.list();

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

@@ -114,7 +114,7 @@ public class AdapterDictService extends SQLGeneralDAO {
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult(offset * limit);
                query.setFirstResult((offset - 1) * limit);
            }
        }

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

@@ -128,7 +128,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult(offset * limit);
                query.setFirstResult((offset - 1) * limit);
            }
        }
        List<AdapterMetadataModel> modelList = query.list();

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

@@ -403,7 +403,7 @@ public class StandardService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StandardModel>) sessionQuery.list();

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

@@ -29,7 +29,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    public static final String BEAN_ID = "StandardVersionService";
    public List<StandardVersionModel> getList(Integer standardId, String condition, String order, Integer limit, Integer offset) {
    public List<StandardVersionModel> getVersionList(Integer standardId, String condition, String order, Integer limit, Integer offset) {
        try {
            Map queryMap = RequestParamTransformer.parseJsonToMap(condition);
            Map orderMap = RequestParamTransformer.parseJsonToMap(order);
@@ -258,7 +258,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StandardVersionModel>) sessionQuery.list();

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

@@ -147,7 +147,7 @@ public class StdCDACatalogService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdCDACatalogModel>) sessionQuery.list();

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

@@ -193,7 +193,7 @@ public class StdCDADatasetService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }

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

@@ -168,7 +168,7 @@ public class StdCDAService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdCDAModel>) sessionQuery.list();

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

@@ -140,7 +140,7 @@ public class StdDatasetCatalogService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdDatasetCatalogModel>) sessionQuery.list();

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

@@ -92,7 +92,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        Map<String, String> order = new HashMap<>();
        query.put("code", code);
        List<StdDataSetModel> list = this.getList(standardVersion, query, order, 1, 0);
        List<StdDataSetModel> list = this.getList(standardVersion, query, order, 1, 1);
        if (!CollectionUtil.isEmpty(list)) {
            return true;
        }
@@ -225,7 +225,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdDataSetModel>) sessionQuery.list();
@@ -261,7 +261,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (limit != null) {
                query.setMaxResults(limit);
                if (offset != null) {
                    query.setFirstResult(offset * limit);
                    query.setFirstResult((offset - 1) * limit);
                }
            }
            return query.list();

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

@@ -78,7 +78,7 @@ public class StdDictEntryService extends SQLGeneralDAO {
        Map<String, String> order = new HashMap<>();
        query.put("code", code);
        List<StdDictionaryEntryModel> list = this.getList(standardVersion, dictId, query, order, 1, 0);
        List<StdDictionaryEntryModel> list = this.getList(standardVersion, dictId, query, order, 1, 1);
        if (!CollectionUtil.isEmpty(list)) {
            return true;
        }
@@ -208,7 +208,7 @@ public class StdDictEntryService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdDictionaryEntryModel>) sessionQuery.list();
@@ -248,14 +248,14 @@ public class StdDictEntryService extends SQLGeneralDAO {
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult(offset * limit);
                query.setFirstResult((offset - 1) * limit);
            }
        }
        return query.list();
    }
    public Integer getDictEntryInt(Class tClass, String stdVersion, Integer dictId, String condition, String order, Integer limit, Integer offset) {
    public Integer getDictEntryInt(Class tClass, String stdVersion, Integer dictId, String condition) {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getDictEntryTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);

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

@@ -215,7 +215,7 @@ public class StdDictService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdDictionaryModel>) sessionQuery.list();
@@ -255,7 +255,7 @@ public class StdDictService extends SQLGeneralDAO {
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult(offset * limit);
                query.setFirstResult((offset - 1) * limit);
            }
        }

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

@@ -81,7 +81,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        Map<String, String> order = new HashMap<>();
        query.put("code", code);
        List<StdMetaDataModel> list = this.getList(standardVersion, datasetId, query, order, 1, 0);
        List<StdMetaDataModel> list = this.getList(standardVersion, datasetId, query, order, 1, 1);
        if (!CollectionUtil.isEmpty(list)) {
            return true;
        }
@@ -203,7 +203,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                sessionQuery.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StdMetaDataModel>) sessionQuery.list();
@@ -243,7 +243,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult(offset * limit);
                query.setFirstResult((offset - 1) * limit);
            }
        }

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

@@ -9,10 +9,16 @@ import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.system.model.SystemOrganization;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,51 +47,39 @@ public class StdPublisherService extends SQLGeneralDAO {
    }
    private List<SystemOrganization> getList(Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
        SqlCreator sqlCreator = new SqlCreator(SystemOrganization.class);
        for (String key : query.keySet()) {
            sqlCreator.equalCondition(key, query.get(key));
        }
        for (String key : order.keySet()) {
            sqlCreator.order(key, order.get(key));
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(SystemOrganization.class);
        if (query != null) {
            for (String key : query.keySet()) {
                criteria.add(Restrictions.eq(key, query.get(key)));
            }
        }
        String sql = sqlCreator.selectData("system_organization");
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            criteria.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult(offset);
                criteria.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<SystemOrganization>) sessionQuery.list();
    }
    public SystemOrganization get(Integer stdPublisherId) {
        try {
            SqlCreator sqlCreator = new SqlCreator(SystemOrganization.class);
            sqlCreator.equalCondition("id", stdPublisherId);
            String sql = sqlCreator.selectData("system_organization");
            Query query = getQuery(sqlCreator, sql);
            return (SystemOrganization) query.uniqueResult();
        } catch (Exception e) {
            throw new ApiException(ErrorCode.GetPublisherFailed);
        if (order != null) {
            for (String key : order.keySet()) {
                if (order.get(key).equals(Constants.ASC)) {
                    criteria.addOrder(Order.asc(key));
                } else if (order.get(key).equals(Constants.DESC)) {
                    criteria.addOrder(Order.desc(key));
                }
            }
        }
        List<SystemOrganization> systemOrganizationList = criteria.list();
        return systemOrganizationList;
    }
    public SystemOrganization getStandardPublisher() {
    public SystemOrganization get(Integer stdPublisherId) {
        try {
            SqlCreator sqlCreator = new SqlCreator(SystemOrganization.class);
            String paramSql = "select s.org_id from system_param s where s.param_key = '"+ Constants.STANDARD+"'";
            Query paramQuery = getCurrentSession().createSQLQuery(paramSql);
            List list = paramQuery.list();
            String publisherCode = StringUtil.toString(list.get(0));
            sqlCreator.equalCondition("code", publisherCode);
            String sql = sqlCreator.selectData("system_organization");
            Query query = getQuery(sqlCreator, sql);
            return (SystemOrganization) query.uniqueResult();
            Session session = getCurrentSession();
            Criteria criteria = session.createCriteria(SystemOrganization.class);
            criteria.add(Restrictions.eq("id", stdPublisherId));
            return (SystemOrganization) criteria.uniqueResult();
        } catch (Exception e) {
            throw new ApiException(ErrorCode.GetPublisherFailed);
        }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetail.jsp

@@ -12,7 +12,7 @@
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control ">
      <input type="text" class="required f-w240 " id="txt_name" name="name">
      <input type="text" class="required f-w240 " id="txt_name" name="name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
@@ -25,32 +25,32 @@
  <div class="m-form-group" id="div_stdId">
    <label><span class="red">*&nbsp;</span>平台标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdId" data-type="select" name="stdId">
      <input type="text" class="required f-w240 " id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
    </div>
  </div>
  <div class="m-form-group" id="div_stdVersion">
    <label><span class="red">*&nbsp;</span>平台标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdVersion" data-type="select" name="stdVersion">
      <input type="text" class="required f-w240 " id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>发布机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode">
      <input type="text" class="required f-w240 " id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdId">
    <label><span class="red">*&nbsp;</span>应用标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdId" data-type="select" name="adapterStdId">
      <input type="text" class="required f-w240 " id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdVersion">
    <label><span class="red">*&nbsp;</span>应用标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion">
      <input type="text" class="required f-w240 " id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
    </div>
  </div>
  <div class="m-form-bottom">
@@ -61,11 +61,11 @@
      <span>确认</span>
    </div>
  </div>
  <input type="hidden" id="type" name="type"/>
  <input type="hidden" id="parent_id" name="parentId"/>
  <input type="hidden" id="status" name="status"/>
  <input type="hidden" id="id" name="id"/>
  <input type="hidden" id="type" name="type" data-attr-scan="type"/>
  <input type="hidden" id="parent_id" name="parentId" data-attr-scan="parentId"/>
  <input type="hidden" id="status" name="status" data-attr-scan="status"/>
  <input type="hidden" id="id" name="id" data-attr-scan="id"/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
  <input type="hidden" id="hd_user" value="${User.id}"/>
  <input type="hidden" id="adapterStdVersion"/>
  <input type="hidden" id="adapterStdVersion" data-attr-scan="adapterStdVersion"/>
</div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/configurationJs.jsp

@@ -1064,7 +1064,7 @@
              dataType : "json",
              url: url,
              processResults: function (data, page) {
                
                debugger
                if(targer=="adapterDatasetCode" || targer=="adapterMetadataCode"
                        || targer=="adapterDictCode" || targer=="adapterEntryCode" || targer=="stdEntryCode"){//由于机构适配值的数据格式为id：id+“，”+code，text：name，但是机构适配值为id:id+","+name,text:code,所以需要重新组装数据
                  var toData;

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/dataset/updateDataset.jsp

@@ -71,7 +71,7 @@
    </div>
  </div>
  <div class="m-form-group">
    <label>数据源名称：</label>
    <label>数据集名称：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="see_name" style="text-align: left;"/>
    </div>