Merge branch 'develop' into dev/orderRuleAndIndex20210127

src/main/java/com/diagbot/repository/TransfusionSuggestNode.java

@@ -1,11 +1,11 @@
 package com.diagbot.repository;
 
 
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.OtherTipTransfusionNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.entity.node.TransfusionSuggest;
-import com.diagbot.biz.push.entity.Item;
-import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.entity.node.YiBaoDiseaseName;
 import com.diagbot.entity.node.YiBaoOperationName;
 import com.diagbot.entity.relationship.TransfusionSuggestYiBaoDiseaseName;
@@ -128,11 +128,17 @@ public class TransfusionSuggestNode {
 						if (null == otherTipTfNeoDTO) {
 							otherTipTfNeoDTO = new OtherTipTransfusionNeoDTO();
 						}
-						item = new Item();
-						item.setName(surgname);
-						item.setUniqueName(surgname);
 
-						otherTipTfNeoDTO.getOperation().add(item);
+						// 提示医院名称
+						for (Item ope : wordCrfDTO.getOperation()) {
+							if (StringUtil.isNotBlank(ope.getName()) &&
+									surgname.equals(ope.getUniqueName())) {
+								item = new Item();
+								item.setName(ope.getName());
+								item.setUniqueName(surgname);
+								otherTipTfNeoDTO.getOperation().add(item);
+							}
+						}
 					} else {
 						proceed = false;
 						otherTipTfNeoDTO = null;
@@ -146,11 +152,17 @@ public class TransfusionSuggestNode {
 						if (null == otherTipTfNeoDTO) {
 							otherTipTfNeoDTO = new OtherTipTransfusionNeoDTO();
 						}
-						item = new Item();
-						item.setName(disname);
-						item.setUniqueName(disname);
 
-						otherTipTfNeoDTO.getDiag().add(item);
+						// 提示医院名称
+						for (Item diag : wordCrfDTO.getDiag()) {
+							if (StringUtil.isNotBlank(diag.getName()) &&
+									disname.equals(diag.getUniqueName())) {
+								item = new Item();
+								item.setName(diag.getName());
+								item.setUniqueName(disname);
+								otherTipTfNeoDTO.getDiag().add(item);
+							}
+						}
 					} else {
 						otherTipTfNeoDTO = null;
 					}