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