11/27 查询优化撤回 修改药品选入diType类型

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<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();

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