Parcourir la source

更新输血建议逻辑

MarkHuang il y a 4 ans
Parent
commit
327921888c

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

@@ -29,18 +29,14 @@ public class TransfusionSuggestNode {
 		List<String> surgery = new ArrayList<>();
 		Map<String, Lis> lismap = new HashMap<>();
 		String disname, surgname, lisname, tfname;
-		String diagname = "";
-		String opername = "";
 		Lis lisresult;
 
 		for (Item dg : wordCrfDTO.getDiag()) {
 			diseases.add(dg.getUniqueName());
-			diagname = dg.getUniqueName();
 		}
 
 		for (Item op : wordCrfDTO.getOperation()) {
 			surgery.add(op.getUniqueName());
-			opername = op.getUniqueName();
 		}
 
 		for (Lis lisitem : wordCrfDTO.getLis()) {
@@ -117,8 +113,8 @@ public class TransfusionSuggestNode {
 					otherTipTfNeoDTO = null;
 				}
 
-				if (StringUtil.isNotBlank(surgname) && proceed) {
-					if (surgname.equals(opername)) {
+				if (surgery.size()>0 && proceed) {
+					if (surgery.contains(surgname)) {
 						if (null == otherTipTfNeoDTO) {
 							otherTipTfNeoDTO = new OtherTipTransfusionNeoDTO();
 						}
@@ -134,9 +130,9 @@ public class TransfusionSuggestNode {
 				}
 
 
-				if (StringUtil.isNotBlank(disname) && proceed) {
+				if (diseases.size()>0 && proceed) {
 
-					if (disname.equals(diagname)) {
+					if (diseases.contains(disname)) {
 						if (null == otherTipTfNeoDTO) {
 							otherTipTfNeoDTO = new OtherTipTransfusionNeoDTO();
 						}