From 34b5dd1dfedde460366955de33000619617e8253 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 27 Nov 2024 11:12:19 +0800 Subject: [PATCH] =?UTF-8?q?11/27=20=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=20=E4=BF=AE=E6=94=B9=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E9=80=89=E5=85=A5diType=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/UdiRelevanceController.java | 5 ++--- .../java/com/glxp/api/service/basic/UdiContrastService.java | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) 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); }