1.去除没用的jar包

2.限制返回格式等

pom.xml

@@ -142,35 +142,11 @@
            <artifactId>jxl</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-orm</artifactId>
        </dependency>
        <!--=============tilesJSP布局框架 start =============-->
        <dependency>
            <groupId>org.apache.tiles</groupId>
            <artifactId>tiles-extras</artifactId>
            <version>${org.apache.tiles-version}</version>
            <exclusions>
                <exclusion>
                    <groupId>com.google.guava</groupId>
                    <artifactId>guava</artifactId>
                </exclusion>
                <exclusion>
                    <artifactId>commons-lang</artifactId>
                    <groupId>commons-lang</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.tiles</groupId>
            <artifactId>tiles-jsp</artifactId>
            <version>${org.apache.tiles-version}</version>
        </dependency>
        <!--=============tiles end =============-->
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>fop</artifactId>
@@ -249,9 +225,8 @@
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-ui-swagger</artifactId>
            <scope>compile</scope>
        </dependency>
        <!-- swagger end -->
        <!--   jxl导出工具-->
        <dependency>
            <groupId>org.apache.poi</groupId>
@@ -269,7 +244,6 @@
                </exclusion>
            </exclusions>
        </dependency>
        <!-- swagger end -->
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>

src/main/java/com/yihu/hos/HosAdminApplication.java

@@ -15,11 +15,14 @@ import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.web.config.EnableSpringDataWebSupport;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@Configuration
@EnableAsync
//@EnableCaching
@EnableDiscoveryClient

src/main/java/com/yihu/hos/ehr/standard/cdatype/controller/CdaTypeEndPoint.java

@@ -44,7 +44,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
    }
    @RequestMapping(value = ServiceApi.Standards.TypesChildren, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.TypesChildren,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "根据父级类别获取父级类别所在以下所有子集类别（包括当前父级列表）")
    public List<MCDAType> getChildIncludeSelfByParentIdsAndKey(
            @ApiParam(name = "patient_ids", value = "父级id")
@@ -83,7 +83,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
//        return (List<MCDAType>)convertToModels(cdaTypeList,new ArrayList<MCDAType>(cdaTypeList.size()),MCDAType.class,"");
//    }
    @RequestMapping(value = ServiceApi.Standards.Types, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.Types,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "标准类别分页搜索")
    public Collection<MCDAType> searchType(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,name,secret,url,createTime")
@@ -104,7 +104,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
        return convertToModels(list, new ArrayList<>(list.size()), MCDAType.class, fields);
    }
    @RequestMapping(value = ServiceApi.Standards.NoPageTypes, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.NoPageTypes,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "标准字典不分页搜索")
    public List<MCDAType> searchSourcesWithoutPaging(
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
@@ -115,7 +115,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
    @RequestMapping(value = ServiceApi.Standards.Type, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.Type,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "根据id获取CDAType")
    public MCDAType getCdaTypeById(
            @ApiParam(name = "id", value = "id")
@@ -127,7 +127,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
    @RequestMapping(value = ServiceApi.Standards.Types, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = ServiceApi.Standards.Types, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增CDAType")
    public MCDAType saveCDAType(
            @ApiParam(name = "model", value = "model")
@@ -141,7 +141,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
    }
    @RequestMapping(value = ServiceApi.Standards.Type,method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = ServiceApi.Standards.Type,method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改CDAType")
    public MCDAType updateCDAType(
            @ApiParam(name = "id", value = "编号")
@@ -185,7 +185,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
        return cdaTypeManager.deleteCdaType(childrenIds);
    }
    @RequestMapping(value = ServiceApi.Standards.TypeOther, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.TypeOther, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.GET)
    @ApiOperation(value = "获取cdaType列表（不包含本身）")
    public List<MCDAType> getOtherCDAType(
            @ApiParam(name = "id", value = "cdaType编号")
@@ -195,7 +195,7 @@ public class CdaTypeEndPoint extends EnvelopRestEndPoint {
    }
    @RequestMapping(value = ServiceApi.Standards.TypeParent, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.TypeParent, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.GET)
    @ApiOperation(value = "根据当前类别获取自己的父级以及同级以及同级所在父级类别列表")
    public List<MCDAType> getCdaTypeExcludeSelfAndChildren(
            @ApiParam(name = "id", value = "id")

src/main/java/com/yihu/hos/ehr/standard/cdaversion/controller/VersionEndPoint.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -57,7 +58,7 @@ public class VersionEndPoint extends ExtendEndPoint<MSTDVersion> {
        return cdaVersion;
    }
    @RequestMapping(value = ServiceApi.Standards.Versions, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.Versions,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "适配采集标准")
    public Collection<MSTDVersion> searchCDAVersions(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "version,versionName,commitTime,baseVersion,inStage")
@@ -93,7 +94,7 @@ public class VersionEndPoint extends ExtendEndPoint<MSTDVersion> {
    //新增标准版本的最新版本信息
    @RequestMapping(value = ServiceApi.Standards.Versions, method = RequestMethod.POST)
    @RequestMapping(value = ServiceApi.Standards.Versions,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.POST)
    @ApiOperation(value = "新增cda版本")
    public MSTDVersion addVersion(
            @ApiParam(name = "userLoginCode", value = "用户登录名")
@@ -157,7 +158,7 @@ public class VersionEndPoint extends ExtendEndPoint<MSTDVersion> {
    }
    @RequestMapping(value = ServiceApi.Standards.Version, method = RequestMethod.PUT)
    @RequestMapping(value = ServiceApi.Standards.Version,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.PUT)
    @ApiOperation(value = "修改版本信息")
    public MSTDVersion updateVersion(
            @ApiParam(name = "version", value = "版本号", defaultValue = "")
@@ -200,7 +201,7 @@ public class VersionEndPoint extends ExtendEndPoint<MSTDVersion> {
        return num > 0;
    }
    @RequestMapping(value = ServiceApi.Standards.Version, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.Version,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "获取版本信息")
    public MSTDVersion getVersion(
            @ApiParam(name = "version", value = "版本号", defaultValue = "")
@@ -219,7 +220,7 @@ public class VersionEndPoint extends ExtendEndPoint<MSTDVersion> {
    }
    @RequestMapping(value = ServiceApi.Standards.VersionLatest, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.VersionLatest,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "获取最新版本")
    public MSTDVersion getLatestVersion()throws Exception {
        STDVersion cdaVersion = versionService.getLatestVersion();

src/main/java/com/yihu/hos/ehr/standard/datasets/controller/DataSetEndPoint.java

@@ -39,7 +39,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
    private StdDatasetService dataSetService;
    @RequestMapping(value = ServiceApi.Standards.DataSets, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.DataSets,produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.GET)
    @ApiOperation(value = "查询数据集的方法")
    public Collection<MStdDataSet> searchDataSets(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
@@ -49,9 +49,9 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @RequestParam(value = "size", required = false) Integer size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "version", value = "版本", defaultValue = "")
            @RequestParam(value = "version") String version,
            HttpServletRequest request,
@@ -65,7 +65,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
    }
    @RequestMapping(value = ServiceApi.Standards.NoPageDataSets, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.NoPageDataSets, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.GET)
    @ApiOperation(value = "标准数据集不分页搜索")
    public Collection<MStdDataSet> searchSourcesWithoutPaging(
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
@@ -106,7 +106,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
    }
    @RequestMapping(value = ServiceApi.Standards.DataSet, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.DataSet,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "获取数据集信息")
    public MStdDataSet getDataSet(
            @ApiParam(name = "id", value = "数据集编号", defaultValue = "")
@@ -117,7 +117,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
        return getModel(dataSetService.retrieve(StdDataSetModel.class,ver.getDataSetTableName() ,id));
    }
    @RequestMapping(value = ServiceApi.Standards.DataSetsIds, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.DataSetsIds, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.GET)
    @ApiOperation(value = "根据数据集ids(用逗号隔开)获取数据集信息")
    public Collection<MStdDataSet> getDataSets(
            @ApiParam(name = "ids", value = "数据集编号", defaultValue = "")
@@ -128,7 +128,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
        return convertToModels(list, new ArrayList<>(list.size()), MStdDataSet.class, "");
    }
    @RequestMapping(value = ServiceApi.Standards.DataSets, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = ServiceApi.Standards.DataSets, method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增数据集信息")
    public MStdDataSet saveDataSet(
            @ApiParam(name = "version", value = "标准版本", defaultValue = "")
@@ -146,7 +146,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
    }
    @RequestMapping(value = ServiceApi.Standards.DataSet, method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = ServiceApi.Standards.DataSet, method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改数据集信息")
    public MStdDataSet updateDataSet(
            @ApiParam(name = "version", value = "标准版本", defaultValue = "")
@@ -171,7 +171,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
    }
    @RequestMapping(value = ServiceApi.Standards.DataSetsName, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.DataSetsName,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "获取数据集 id-name : map集")
    public Map<Long,String> getDataSetMapByIds(
            @ApiParam(name = "version", value = "版本号", defaultValue = "")
@@ -200,7 +200,7 @@ public class DataSetEndPoint extends ExtendEndPoint<MStdDataSet> {
        return true;
    }
    @RequestMapping(value = ServiceApi.Standards.AdaptMeta, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.AdaptMeta,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "获取ehr适配的数据元", notes = "获取ehr适配的数据元")
    public List<Map<String, Object>> getEhrAdapterMetadata( @RequestParam(value = "version")String version){
        return dataSetService.getEhrAdapterMetadata(version);

src/main/java/com/yihu/hos/ehr/standard/datasets/controller/MetaDataEndPoint.java

@@ -47,7 +47,7 @@ public class MetaDataEndPoint extends ExtendEndPoint<MStdMetaData> {
    private StdMetadataService metaDataService;
    @RequestMapping(value = ServiceApi.Standards.MetaDatas, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.MetaDatas,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "查询数据元")
    public Collection<MStdMetaData> searchMetaDatas(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
@@ -115,7 +115,7 @@ public class MetaDataEndPoint extends ExtendEndPoint<MStdMetaData> {
    }
    @RequestMapping(value = ServiceApi.Standards.MetaData, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.MetaData,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "获取数据元")
    public MStdMetaData getMetaData(
            @ApiParam(name = "id", value = "数据元编号", defaultValue = "")
@@ -126,7 +126,7 @@ public class MetaDataEndPoint extends ExtendEndPoint<MStdMetaData> {
        return getModel(metaDataService.retrieve(StdMetaDataModel.class,ver.getMetaDataTableName(),id));
    }
    @RequestMapping(value = ServiceApi.Standards.MetaDatasWithDataSet, method = RequestMethod.GET)
    @RequestMapping(value = ServiceApi.Standards.MetaDatasWithDataSet,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
    @ApiOperation(value = "根据数据集id获取数据元")
    public Collection<MStdMetaData> getMetaDataByDataSetId(
            @ApiParam(name = "data_set_id", value = "数据元编号", defaultValue = "")
@@ -137,7 +137,7 @@ public class MetaDataEndPoint extends ExtendEndPoint<MStdMetaData> {
        return convertToModels(list, new ArrayList<>(list.size()), MStdMetaData.class, "");
    }
    @RequestMapping(value = ServiceApi.Standards.MetaData, method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = ServiceApi.Standards.MetaData, method = RequestMethod.PUT,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新数据元")
    public MStdMetaData updataMetaSet(
            @ApiParam(name = "version", value = "版本", defaultValue = "")
@@ -158,7 +158,7 @@ public class MetaDataEndPoint extends ExtendEndPoint<MStdMetaData> {
    }
    @RequestMapping(value = ServiceApi.Standards.MetaDatas, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = ServiceApi.Standards.MetaDatas, method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增数据元")
    public MStdMetaData saveMetaSet(
            @ApiParam(name = "version", value = "版本", defaultValue = "")
@@ -200,7 +200,7 @@ public class MetaDataEndPoint extends ExtendEndPoint<MStdMetaData> {
    }
    @RequestMapping(value = ServiceApi.Standards.MetaDatasName, method = RequestMethod.POST)
    @RequestMapping(value = ServiceApi.Standards.MetaDatasName,produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.POST)
    @ApiOperation(value = "获取数据元 id-name : map集")
    public Map<Long,Object> getMetaDataMapByIds(
            @ApiParam(name = "parmModel", value = "参数模型", defaultValue = "")

src/main/java/com/yihu/hos/standard/controller/StdCenterEndPoint.java

@@ -4,6 +4,7 @@ import com.yihu.hos.config.JsonDateValueProcessor;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.*;
import com.yihu.hos.standard.service.standard.*;
import com.yihu.hos.web.framework.model.Envelop;
import com.yihu.hos.web.framework.model.standard.StandardVersion;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
@@ -143,13 +144,13 @@ public class StdCenterEndPoint extends BaseController {
    @RequestMapping(value="/lastDictItem/list",method = RequestMethod.GET, produces = "application/json")
    @ApiOperation(value = "根据字典code,获取健康之路最新的字典项",  produces = "application/json", notes = "根据字典code,获取健康之路最新的字典项")
    public List getLastDictItem(@ApiParam(name = "code", value = "字典code", defaultValue = "")
    public Envelop getLastDictItem(@ApiParam(name = "code", value = "字典code", defaultValue = "")
                                @RequestParam(value = "code") String code,
                                @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                                   @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                                @RequestParam(value = "filters", required = false) String filters,
                                @RequestParam(value = "sorts", required = false) String sorts,
                                @RequestParam(value = "size", required = false) Integer size,
                                @RequestParam(value = "page", required = false) Integer page) throws IOException {
                                   @RequestParam(value = "sorts", required = false) String sorts,
                                   @RequestParam(value = "size", required = false) Integer size,
                                   @RequestParam(value = "page", required = false) Integer page) throws IOException {
        List result = new ArrayList();
        String ver = standardService.getLastStandByOrgCode(defaultOrgCode);
        if(StringUtils.isNotBlank(ver)){
@@ -161,18 +162,27 @@ public class StdCenterEndPoint extends BaseController {
                }
                ids = ids.substring(1,ids.length());
                if(StringUtils.isBlank(filters)){
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, null, null,true);
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, page, size,true);
                }else{
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids+";"+filters, null, page, size,true);
                }
            }
        }
        return result;
        Envelop envelop = new Envelop();
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(result);
        if(size!=null && page!=null && size!=0){
            envelop.setCurrPage(page);
            envelop.setPageSize(size);
            envelop.setTotalPage(result.size() % size > 0 ? result.size() / size + 1 : result.size() / size);
        }
        envelop.setTotalCount(result.size());
        return envelop;
    }
    @RequestMapping(value="/lastVersionDrug/list",method = RequestMethod.GET, produces = "application/json")
    @ApiOperation(value = "去重,获取最新版本号的药品名称",  produces = "application/json", notes = "去重,获取最新版本号的药品名称\",  produces = \"application/json")
    public List getLastVersionDrug(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
    public Envelop getLastVersionDrug(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                                @RequestParam(value = "filters", required = false) String filters,
                                @RequestParam(value = "size", required = false) Integer size,
                                @RequestParam(value = "page", required = false) Integer page) throws IOException {
@@ -189,12 +199,21 @@ public class StdCenterEndPoint extends BaseController {
                List<String> fileds = new ArrayList<>();
                fileds.add("value");
                if(StringUtils.isBlank(filters)){
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, null, null,true);
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, page, size,true);
                }else{
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids+";"+filters, null, page, size,true);
                }
            }
        }
        return result;
        Envelop envelop = new Envelop();
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(result);
        if(size!=null && page!=null && size!=0){
            envelop.setCurrPage(page);
            envelop.setPageSize(size);
            envelop.setTotalPage(result.size() % size > 0 ? result.size() / size + 1 : result.size() / size);
        }
        envelop.setTotalCount(result.size());
        return envelop;
    }
}

src/main/resources/application.yml

@@ -52,6 +52,12 @@ fast-dfs:
    secret-key: FastDFS1234567890
org_code: jkzl
info:
  app:
    name: SVR-EIP-ADMIN
    description: EHR Platform Microservice.
    version: 1.0.0
---
spring:
  profiles: dev