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 46ab7e74a..66b6a81f8 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -169,10 +169,9 @@ public class UdiRelevanceController extends BaseController { filterUdiRelRequest.setNameCode(null); } } + } else { + filterUdiRelRequest.setDiType(1); } -// else { -// filterUdiRelRequest.setDiType(1); -// } List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest); PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); 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 3f3a8351a..29233bdf1 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -352,7 +352,9 @@ public class UdiContrastService { udiProductEntity.setXjdw(ybDrug.getMinUnit()); udiProductEntity.setBhxjsl(ybDrug.getFactor()); } - udiProductEntity.setDiType(IntUtil.value(thirdAliDrug.getPackLevel()) == 1 ? 1 : 4); + if (thirdAliDrug.getPackLevel() !=null ){ + udiProductEntity.setDiType(IntUtil.value(thirdAliDrug.getPackLevel()) == 1 ? 1 : 4); + } udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductService.insertUdiInfo(udiProductEntity); }