Browse Source

更新输血建议的判断逻辑

MarkHuang 4 years ago
parent
commit
8aa5cb4ab3
1 changed files with 4 additions and 12 deletions
  1. 4 12
      src/main/java/com/diagbot/repository/TransfusionSuggestNode.java

+ 4 - 12
src/main/java/com/diagbot/repository/TransfusionSuggestNode.java

@@ -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) {