Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -10,13 +10,12 @@ import com.diagbot.repository.LisNameRepository;
 import com.diagbot.repository.LisSetRepository;
 import com.diagbot.repository.MedicineRepository;
 import com.diagbot.repository.PacsNameRepository;
+import com.diagbot.repository.TransfusionRemindRepository;
 import com.diagbot.repository.YiBaoDiseaseRepository;
 import com.diagbot.repository.YiBaoOperationNameRepository;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.ConceptVO;
 import com.google.common.collect.Lists;
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -49,6 +48,9 @@ public class ConceptFacade {
     @Autowired
     YiBaoOperationNameRepository yiBaoOperationNameRepository;
 
+    @Autowired
+    TransfusionRemindRepository transfusionRemindRepository;
+
     public List<String> getConceptNames(ConceptVO conceptVO) {
         if (ListUtil.isEmpty(conceptVO.getNames())) {
             return new ArrayList<>();
@@ -113,6 +115,10 @@ public class ConceptFacade {
             case 7:
                 break;
             case 8:
+                List<String> transfusionNames = transfusionRemindRepository.findTransfusionByTypeIn(conceptVO.getNames());
+                if (ListUtil.isNotEmpty(transfusionNames)) {
+                    retList = transfusionNames;
+                }
                 break;
         }
         return retList;

src/main/java/com/diagbot/process/PushProcess.java

@@ -42,10 +42,10 @@ public class PushProcess {
         if(pushVO.getDiagVo() != null && pushVO.getDiagVo().getDiags().size() > 0){
             reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO,dis,wordCrfDTO.getDiag());
         }else {
-            List<String> symptoms = new ArrayList<>();
-            symptoms.add("嗜睡");
-            symptoms.add("恶心");
-            neoFacade.getDisBySymptom(symptoms);
+//            List<String> symptoms = new ArrayList<>();
+//            symptoms.add("嗜睡");
+//            symptoms.add("恶心");
+//            neoFacade.getDisBySymptom(symptoms);
             //正推
             List<NeoPushDTO> push = neoFacade.getPush(pushVO);
             if(ListUtil.isNotEmpty(push) && push.size() >0){

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

@@ -20,5 +20,8 @@ public interface TransfusionRemindRepository extends Neo4jRepository<Transfusion
     @Query("MATCH (n:输血提醒指标) where n.输注类型 contains {name} return n")
     List<TransfusionRemind> findByTransfusionName(@Param("name") String name);
 
+    @Query("MATCH (n:输血提醒指标) where n.输注类型 in {names} return distinct(n.输注类型)")
+    List<String> findTransfusionByTypeIn(@Param("names") List<String> names);
+
 }