From 40913d3813c3a53548ee414481d6636a4db7c6ed Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 11 Sep 2024 17:08:14 +0800 Subject: [PATCH] =?UTF-8?q?9/11=20=E8=8D=AF=E5=93=81=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/basic/UdiRelevanceController.java | 3 +++ src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java | 1 + src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java | 1 + .../java/com/glxp/api/service/basic/UdiContrastService.java | 3 +-- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 1 + 5 files changed, 7 insertions(+), 2 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 07e030790..f396ea570 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -242,6 +242,9 @@ public class UdiRelevanceController extends BaseController { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId()); FilterUdiRelRequest tempRequest = new FilterUdiRelRequest(); tempRequest.setUuid(udiRelevanceEntity.getUuid()); + if (filterUdiRelRequest.getProductType() == 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/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index cfcfaf70c..eafe38598 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -117,6 +117,7 @@ public class FilterUdiRelRequest extends ListPageRequest { //药品参数 private String cpms; private Integer productsType = 1;//默认是耗材 + private Integer productType; /** * 收费项目编码 diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 484cce1df..95df31770 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -77,6 +77,7 @@ public class UdiRelevanceResponse { private String manufactory; private String measname; private Integer productsType; + private Integer productType; private String scbssfbhph; private String scbssfbhxlh; private String scbssfbhscrq; 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 86c136cfa..ec1cf7da0 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -326,9 +326,8 @@ public class UdiContrastService { } udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); udiProductService.insertUdiInfo(udiProductEntity); - packLevel++; } - setLevel(udiRelevanceEntity.getUuid()); +// setLevel(udiRelevanceEntity.getUuid()); UdiProductEntity byUuid = udiProductService.findByUuid(udiRelevanceEntity.getUuid()); udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, byUuid); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 8bd35d438..4a5df0ff0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -587,6 +587,7 @@ basic_products.medicareType, basic_products.requireScanCode, basic_products.workPlaceCount, + basic_products.productsType as productType, th.hsmc hslbName FROM basic_products inner JOIN basic_udirel