分页代码修改

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/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){
@@ -165,7 +165,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 +196,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);

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);
@@ -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

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