diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 66b6a81f8..60a4af1b8 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -249,9 +249,9 @@ public class UdiRelevanceController extends BaseController { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId()); FilterUdiRelRequest tempRequest = new FilterUdiRelRequest(); tempRequest.setUuid(udiRelevanceEntity.getUuid()); - if (filterUdiRelRequest.getProductsType() == 2) { - tempRequest.setNameCode(filterUdiRelRequest.getNameCode()); - } +// if (filterUdiRelRequest.getProductsType() == 2) { +// tempRequest.setNameCode(filterUdiRelRequest.getNameCode()); +// } List udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest); List udiRelevanceResponses = new ArrayList<>(); if (CollUtil.isNotEmpty(udiInfoEntities)) { diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 85b0df315..df8582fab 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -354,9 +354,9 @@ public class UdiContrastService { udiProductEntity.setPrepnUnit(ybDrug.getRealityMedicinemodel()); - } else { - - + } + if (StrUtil.isEmpty(udiProductEntity.getZczbhhzbapzbh()) || StrUtil.isEmpty(udiProductEntity.getCpmctymc())) { + return; } List thirdAliDrugList = thirdAliDrugService.list( new QueryWrapper() diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index cc0e240eb..c5db04ad2 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -839,6 +839,8 @@ public class IoCollectOrderService extends ServiceImpl {