选入药品加上一些查询条件

src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java

@@ -84,17 +84,19 @@ public class ThirdAliDrugController extends BaseController {
         filterUdiRelRequest.setUuid(thirdAliDrug.getUuid());
         List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(filterUdiRelRequest);
         List<String> nameCodeIn = new ArrayList<>();
-        if(udiInfoEntities!=null && udiInfoEntities.size() >0){
+        if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
             for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
-                if(StringUtils.isNotEmpty(udiInfoEntity.getNameCode())){
+                if (StringUtils.isNotEmpty(udiInfoEntity.getNameCode())) {
                     nameCodeIn.add(udiInfoEntity.getNameCode());
                 }
             }
 
         }
         thirdAliDrug.setNameCodeIn(nameCodeIn);
+        // 不查本地库全查阿里的库
         List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);
         if(list == null || list.size() == 0){
+
         AuthAliUser authAliUser = authAliUserService.getOne();
         AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust = new AlihealthThirdAliDrugInsertReqeust();
         alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid());
@@ -104,7 +106,10 @@ public class ThirdAliDrugController extends BaseController {
         AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust();
         alihealthKytDrugrescodeReqeust.setPhysic_name(thirdAliDrug.getCpmctymc());
         alihealthKytDrugrescodeReqeust.setApproval_licence_no(thirdAliDrug.getApprovalNum());
-            alihealthKytDrugrescodeReqeust.setPage_size(100);
+        alihealthKytDrugrescodeReqeust.setPackage_spec(thirdAliDrug.getBzgg());
+        alihealthKytDrugrescodeReqeust.setPrepn_spec(thirdAliDrug.getFormSpec());
+
+        alihealthKytDrugrescodeReqeust.setPage_size(200);
         alihealthKytDrugrescodeReqeust.setPage(1);
         alihealthKytDrugrescodeReqeust.setApp_key(authAliUser.getAppkey());
         alihealthKytDrugrescodeReqeust.setRef_ent_id(authAliUser.getRefentid());
@@ -132,7 +137,6 @@ public class ThirdAliDrugController extends BaseController {
             }
 
         } catch (Exception e) {
-                e.printStackTrace();
             log.info("供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage());
 
         }

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -376,7 +376,7 @@ public class UdiContrastService {
                         AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust();
                         alihealthKytDrugrescodeReqeust.setPhysic_name(udiProductEntity.getCpmctymc());
                         alihealthKytDrugrescodeReqeust.setApproval_licence_no(udiProductEntity.getZczbhhzbapzbh());
-                        alihealthKytDrugrescodeReqeust.setPage_size(100);
+                        alihealthKytDrugrescodeReqeust.setPage_size(200);
                         alihealthKytDrugrescodeReqeust.setPage(1);
                         alihealthKytDrugrescodeReqeust.setApp_key(authAliUser.getAppkey());
                         alihealthKytDrugrescodeReqeust.setRef_ent_id(authAliUser.getRefentid());

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -640,6 +640,8 @@ public class UdiProductServiceImpl implements UdiProductService {
                             .like(StringUtils.isNotBlank( thirdAliDrugRequest.getCpmctymc()),"cpmctymc", thirdAliDrugRequest.getCpmctymc())
                             .like(StringUtils.isNotBlank( thirdAliDrugRequest.getManufacturer()),"manufacturer", thirdAliDrugRequest.getManufacturer())
                             .eq(StringUtils.isNotBlank( thirdAliDrugRequest.getApprovalNum()),"approvalNum", thirdAliDrugRequest.getApprovalNum())
+                            .like(StringUtils.isNotBlank( thirdAliDrugRequest.getFormSpec()),"formSpec", thirdAliDrugRequest.getFormSpec())
+                            .like(StringUtils.isNotBlank( thirdAliDrugRequest.getBzgg()),"bzgg", thirdAliDrugRequest.getBzgg())
 
             );
             if (thirdAliDrugList != null && thirdAliDrugList.size() > 0) {

src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml

@@ -91,9 +91,15 @@
                     #{id}
                 </foreach>
             </if>
+            <if test="formSpec != '' and formSpec != null">
+                AND formSpec LIKE concat('%', #{formSpec}, '%')
+            </if>
             <if test="manufacturer != '' and manufacturer != null">
                 AND manufacturer LIKE concat('%', #{manufacturer}, '%')
             </if>
+            <if test="bzgg != '' and bzgg != null">
+                AND bzgg LIKE concat('%', #{bzgg}, '%')
+            </if>
         </where>
         order by cpmctymc,approvalNum,packRatio,packLevel
     </select>