|
|
|
@ -59,6 +59,8 @@ public class ThirdAliDrugController {
|
|
|
|
|
return ResultVOUtils.success("查询参数不能为空");
|
|
|
|
|
}
|
|
|
|
|
List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);
|
|
|
|
|
List<String> nameCodeIn = thirdAliDrug.getNameCodeIn();
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(list)){
|
|
|
|
|
// 剔除当前选入的产品编码要给他删了再重新查一次判断 如果还是查不到就去查阿里
|
|
|
|
|
thirdAliDrug.setNameCodeIn(null);
|
|
|
|
@ -93,9 +95,26 @@ public class ThirdAliDrugController {
|
|
|
|
|
log.error("异步更新阿里药品数据错误==="+e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
// 判断中文括号和英文括号的就今昔新的结果进行剔除
|
|
|
|
|
if(thirdAliDrug.getCpmctymc().contains("(") || thirdAliDrug.getCpmctymc().contains("(")){
|
|
|
|
|
List<ThirdAliDrug> listResult = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
if(CollUtil.isNotEmpty(list)){
|
|
|
|
|
for (ThirdAliDrug aliDrug : list) {
|
|
|
|
|
if(!nameCodeIn.contains(aliDrug.getNameCode())){
|
|
|
|
|
listResult.add(aliDrug);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
list = listResult;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PageInfo<ThirdAliDrug> pageInfo = new PageInfo<>(list);
|
|
|
|
|
PageSimpleResponse<ThirdAliDrug> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
@ -140,7 +159,7 @@ public class ThirdAliDrugController {
|
|
|
|
|
thirdAliDrugList = thirdAliDrugService.list(
|
|
|
|
|
new QueryWrapper<ThirdAliDrug>().eq(StringUtils.isNotBlank(thirdAliDrugServiceOne.getBzgg()), "bzgg", thirdAliDrugServiceOne.getBzgg())
|
|
|
|
|
.eq(StringUtils.isNotBlank(thirdAliDrugServiceOne.getPackRatio()), "packRatio", thirdAliDrugServiceOne.getPackRatio())
|
|
|
|
|
.like(StringUtils.isNotBlank(thirdAliDrugRequest.getCpmctymc()), "cpmctymc", thirdAliDrugRequest.getCpmctymc())
|
|
|
|
|
.likeLeft(StringUtils.isNotBlank(thirdAliDrugServiceOne.getCpmctymc()), "cpmctymc", thirdAliDrugServiceOne.getCpmctymc())
|
|
|
|
|
.like(StringUtils.isNotBlank(thirdAliDrugRequest.getManufacturer()), "manufacturer", thirdAliDrugRequest.getManufacturer())
|
|
|
|
|
.like(StringUtils.isNotBlank(thirdAliDrugRequest.getApprovalNum()), "approvalNum", thirdAliDrugRequest.getApprovalNum())
|
|
|
|
|
.like(StringUtils.isNotBlank(thirdAliDrugRequest.getFormSpec()), "formSpec", thirdAliDrugRequest.getFormSpec())
|
|
|
|
|