|
@@ -2959,9 +2959,21 @@ public class ApiController {
|
|
if ("3".equals(wmScorePackage.getPackageType1())) {
|
|
if ("3".equals(wmScorePackage.getPackageType1())) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) || !ArrayUtils.contains(wmScorePackage.getDrugProducerList(),drugProducer)){
|
|
|
|
|
|
+ if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList())){
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+ boolean flag = false;
|
|
|
|
+ for (String name : wmScorePackage.getDrugProducerList() ){
|
|
|
|
+ if (StringUtils.equals(name, drugProducer)){
|
|
|
|
+ flag = true;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!flag){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 过滤有效任务类型
|
|
* 过滤有效任务类型
|
|
*/
|
|
*/
|