Browse Source

更新输血建议的判断逻辑

MarkHuang 4 years ago
parent
commit
5510f89cd3
1 changed files with 10 additions and 2 deletions
  1. 10 2
      src/main/java/com/diagbot/repository/TransfusionSuggestNode.java

+ 10 - 2
src/main/java/com/diagbot/repository/TransfusionSuggestNode.java

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