chenyongxing %!s(int64=6) %!d(string=hai) anos
pai
achega
f12b7b18fa

+ 2 - 2
src/main/java/com/yihu/hos/config/WebMvcConfig.java

@ -32,8 +32,8 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
    public void addResourceHandlers(ResourceHandlerRegistry registry) {
        registry.addResourceHandler("swagger-ui.html")
                .addResourceLocations("classpath:/META-INF/resources/");
        registry.addResourceHandler("/webjars/**")
                .addResourceLocations("classpath:/META-INF/resources/webjars/");
//        registry.addResourceHandler("/webjars/**")
//                .addResourceLocations("classpath:/META-INF/resources/webjars/");
    }
}

+ 7 - 7
src/main/java/com/yihu/hos/standard/controller/StdCenterEndPoint.java

@ -175,18 +175,18 @@ public class StdCenterEndPoint extends BaseController {
        Envelop envelop = new Envelop();
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(result);
        total = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, condition, null, null, null,true).size();
        if(size!=null && page!=null && size!=0){
            total = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, condition, null, null, null,true).size();
            envelop.setCurrPage(page);
            envelop.setPageSize(size);
            envelop.setTotalPage(total % size > 0 ? total / size + 1 : total / size);
        }
        envelop.setTotalCount(result.size());
        envelop.setTotalCount(total);
        return envelop;
    }
    @RequestMapping(value="/lastVersionDrug/list",method = RequestMethod.GET, produces = "application/json")
    @ApiOperation(value = "去重,获取最新版本号的药品名称",  produces = "application/json", notes = "去重,获取最新版本号的药品名称\",  produces = \"application/json")
    @ApiOperation(value = "去重,获取最新版本号的药品名称",  produces = "application/json", notes = "去重,获取最新版本号的药品名称")
    public Envelop getLastVersionDrug(@ApiParam(name = "filters", value = "过滤器,为空检索所有条件", defaultValue = "")
                                @RequestParam(value = "filters", required = false) String filters,
                                @RequestParam(value = "size", required = false) Integer size,
@ -216,15 +216,15 @@ public class StdCenterEndPoint extends BaseController {
        Envelop envelop = new Envelop();
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(result);
        List<String> fileds = new ArrayList<>();
        fileds.add("value");
        total = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, fileds, StandardVersion.DictEntryTable, ver, condition, null, null, null, true).size();
        if(size!=null && page!=null && size!=0){
            List<String> fileds = new ArrayList<>();
            fileds.add("value");
            total = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, fileds, StandardVersion.DictEntryTable, ver, condition, null, null, null, true).size();
            envelop.setCurrPage(page);
            envelop.setPageSize(size);
            envelop.setTotalPage(total % size > 0 ? total / size + 1 : total / size);
        }
        envelop.setTotalCount(result.size());
        envelop.setTotalCount(total);
        return envelop;
    }
}