|
@@ -29,22 +29,16 @@ public class BEH0072 extends QCCatalogue {
|
|
|
if (ListUtil.isEmpty(families)) {
|
|
|
return;
|
|
|
}
|
|
|
- int deadObjectNum = 0;
|
|
|
for (Family family : families) {
|
|
|
- if (family.getDead() == null) {
|
|
|
- deadObjectNum++;
|
|
|
- } else {
|
|
|
+ if (family.getDead() != null) {
|
|
|
Dead dead = family.getDead();
|
|
|
- if (dead.getDeadReason() != null && StringUtil.isBlank(dead.getDeadReason().getName())
|
|
|
- && dead.getUnknow() != null && StringUtil.isBlank(dead.getUnknow().getName())) {
|
|
|
+ if (dead.getDeadReason() == null || StringUtil.isBlank(dead.getDeadReason().getName())
|
|
|
+ && dead.getUnknow() == null || StringUtil.isBlank(dead.getUnknow().getName())) {
|
|
|
status.set("-1");
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (deadObjectNum != families.size()) {
|
|
|
- status.set("-1");
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|