|
@@ -113,7 +113,7 @@ public class TransfusionSuggestNode {
|
|
|
otherTipTfNeoDTO = null;
|
|
|
}
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(surgery) && proceed) {
|
|
|
+ if (StringUtil.isNotBlank(surgname) && ListUtil.isNotEmpty(surgery) && proceed) {
|
|
|
if (surgery.contains(surgname)) {
|
|
|
if (null == otherTipTfNeoDTO) {
|
|
|
otherTipTfNeoDTO = new OtherTipTransfusionNeoDTO();
|
|
@@ -128,9 +128,13 @@ public class TransfusionSuggestNode {
|
|
|
otherTipTfNeoDTO = null;
|
|
|
}
|
|
|
}
|
|
|
+ else {
|
|
|
+ proceed = false;
|
|
|
+ otherTipTfNeoDTO = null;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(diseases) && proceed) {
|
|
|
+ if (StringUtil.isNotBlank(disname) && ListUtil.isNotEmpty(diseases) && proceed) {
|
|
|
|
|
|
if (diseases.contains(disname)) {
|
|
|
if (null == otherTipTfNeoDTO) {
|
|
@@ -145,6 +149,10 @@ public class TransfusionSuggestNode {
|
|
|
otherTipTfNeoDTO = null;
|
|
|
}
|
|
|
}
|
|
|
+ else {
|
|
|
+ proceed = false;
|
|
|
+ otherTipTfNeoDTO = null;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
if (otherTipTfNeoDTO != null) {
|