概念搜索修改

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -143,7 +143,8 @@ public class ConceptFacade extends ConceptServiceImpl {
             conceptQe.in("id", libraryInfoList.stream().map(i -> i.getConceptId()).distinct().collect(Collectors.toList()));
             Map<Long, Concept> conceptMap = list(conceptQe).stream().collect(Collectors.toMap(Concept::getId, i -> i));
             libraryInfoList.forEach(i -> {
-                if (conceptMap.get(i.getConceptId()) == null || conceptMap.get(i.getConceptId()).getLibId().intValue() != i.getId().intValue()) {
+                if (conceptMap.get(i.getConceptId()) == null || conceptMap.get(i.getConceptId()).getLibId().intValue() != i.getId().intValue()
+                		||(getAllConceptVO.getExcludedConceptIds() != null && getAllConceptVO.getExcludedConceptIds().contains(i.getConceptId()))) {
                     i.setIsDeleted("Y");
                 }
             });

knowledgeman-service/src/main/java/com/diagbot/vo/GetAllConceptVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import java.util.List;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -31,4 +33,10 @@ public class GetAllConceptVO {
     @ApiModelProperty(value="是否过滤添加过术语属性的概念,1:是,0:否")
     private Integer isMedical;
     
+    /**
+     * 需要排除的概念id集合
+     */
+    @ApiModelProperty(value="需要排除的概念id集合")
+    private List<Long> excludedConceptIds;
+    
 }