|
@@ -41,10 +41,12 @@ public class BEH0039 extends QCCatalogue {
|
|
|
if (allergy == null
|
|
|
|| StringUtil.isBlank(allergy.getName())
|
|
|
|| allergy.getAllergyFood() == null
|
|
|
- || StringUtil.isBlank(allergy.getAllergyFood().getName())) {
|
|
|
+ || StringUtil.isBlank(allergy.getAllergyFood().getName())
|
|
|
+ || allergy.getAllergyFood().getName().equals("食物")) {
|
|
|
continue;
|
|
|
}
|
|
|
- if ((allergy.getNegative() == null || StringUtil.isBlank(allergy.getNegative().getName()))
|
|
|
+ //
|
|
|
+ if ((allergy.getNegative() == null || StringUtil.isBlank(allergy.getNegative().getName()) )
|
|
|
&& (allergy.getAllergyFood().getPd() == null || StringUtil.isBlank(allergy.getAllergyFood().getPd().getName()))
|
|
|
&& (allergy.getAllergyFood().getDegree() == null || StringUtil.isBlank(allergy.getAllergyFood().getDegree().getName()))
|
|
|
&& (allergy.getAllergyFood().getAllergyDesc() == null || StringUtil.isBlank(allergy.getAllergyFood().getAllergyDesc().getName()))) {
|