|
@@ -35,8 +35,11 @@ public class BEH0035 extends QCCatalogue {
|
|
|
|
|
|
List<String> wtAmNames = CatalogueUtil.noInQuotes(
|
|
|
allergies.stream().filter(
|
|
|
- i -> i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
|
|
|
- && i.getAllergyMedicine() != null && StringUtil.isNotBlank(i.getAllergyMedicine().getName()))
|
|
|
+ i -> i != null && StringUtil.isNotBlank(i.getName())
|
|
|
+ && i.getNegative() == null
|
|
|
+ && i.getAllergyMedicine() != null
|
|
|
+ && StringUtil.isNotBlank(i.getAllergyMedicine().getName())
|
|
|
+ && !i.getAllergyMedicine().getName().equals("药物"))
|
|
|
.map(i -> i.getAllergyMedicine().getName()).distinct().collect(Collectors.toList()),
|
|
|
pastLabel.getText()
|
|
|
);
|