9/11 药品基础数据

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<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest);
         List<UdiRelevanceResponse> udiRelevanceResponses = new ArrayList<>();
         if (CollUtil.isNotEmpty(udiInfoEntities)) {

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;
 
     /**
      * 收费项目编码

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;

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);

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