去重查询药品

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

@@ -144,22 +144,54 @@ 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 = "")
                              @RequestParam(value = "code") String code,
                                @RequestParam(value = "code") String code,
                                @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                                @RequestParam(value = "filters", required = false) String filters,
                                @RequestParam(value = "sorts", required = false) String sorts,
                                @RequestParam(value = "size", required = true) int size,
                                @RequestParam(value = "page", required = true) int page) throws IOException {
                                @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)){
            List<StdDictionaryModel> list = stdDictService.searchPage(StdDictionaryModel.class, StandardVersion.DictTable,ver, "code="+code, null, null, null,true);
            if(CollectionUtils.isNotEmpty(list)){
                Long id = list.get(0).getId();
                String ids ="";
                for (StdDictionaryModel model:list){
                    ids+= ","+model.getId();
                }
                ids = ids.substring(1,ids.length());
                if(StringUtils.isBlank(filters)){
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, null, null,true);
                }else{
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids+";"+filters, null, page, size,true);
                }
            }
        }
        return result;
    }
    @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 = "")
                                @RequestParam(value = "filters", required = false) String filters,
                                @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)){
            List<StdDictionaryModel> list = stdDictService.searchPage(StdDictionaryModel.class, StandardVersion.DictTable,ver, "code=STD_MEDICINE,CV08.50.301", null, null, null,true);
            if(CollectionUtils.isNotEmpty(list)){
                String ids ="";
                for (StdDictionaryModel model:list){
                    ids+= ","+model.getId();
                }
                ids = ids.substring(1,ids.length());
                List<String> fileds = new ArrayList<>();
                fileds.add("value");
                if(StringUtils.isBlank(filters)){
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+id, null, null, null,true);
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, null, null,true);
                }else{
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+id+";"+filters, sorts, page, size,true);
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids+";"+filters, null, page, size,true);
                }
            }
        }