Merge branch 'master' of http://192.168.1.220:10080/EHR/svr-pack-analyzer

src/main/java/com/yihu/ehr/analyze/controller/dataQuality/WarningSettingEndPoint.java

@@ -566,11 +566,15 @@ public class WarningSettingEndPoint extends EnvelopRestEndPoint {
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page) {
            @RequestParam(value = "page", required = false) int page,
            @ApiParam(name = "version", value = "版本号")
            @RequestParam(value = "version", required = false) String version) {
        Envelop envelop = new Envelop();
        try {
            String lastStandByOrgCode = standardServiceClient.getLastStandByOrgCode(defaultOrgCode);
            ResponseEntity<List<MStdDataSet>> res = standardServiceClient.searchDataSets(fields,filters,sorts,size,page,lastStandByOrgCode);
            if(StringUtils.isBlank(version)){
                version = standardServiceClient.getLastStandByOrgCode(defaultOrgCode);
            }
            ResponseEntity<List<MStdDataSet>> res = standardServiceClient.searchDataSets(fields,filters,sorts,size,page,version);
            List<MStdDataSet> mStdDataSetList = res.getBody();
            int totalCount = getTotalCount(res);
            return getPageResult(mStdDataSetList,totalCount,page,size);