|
@@ -67,7 +67,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public List<StaticKnowledgeIndexDTO> staticKnowledgeIndexWithoutInfo(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
|
|
|
- List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = staticKnowledgeIndex(staticKnowledgeIndexVO);
|
|
|
+ List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = staticKnowledgeIndex(staticKnowledgeIndexVO, 1);
|
|
|
//过滤没有静态知识的检索结果
|
|
|
staticKnowledgeIndexDTOList = staticKnowledgeIndexDTOList
|
|
|
.stream()
|
|
@@ -80,9 +80,10 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
* 医学知识(静态信息)检索
|
|
|
*
|
|
|
* @param staticKnowledgeIndexVO
|
|
|
+ * @param type 0:过滤逻辑删除数据,1:不过滤逻辑删除数据
|
|
|
* @return
|
|
|
*/
|
|
|
- public List<StaticKnowledgeIndexDTO> staticKnowledgeIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
|
|
|
+ public List<StaticKnowledgeIndexDTO> staticKnowledgeIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO, Integer type) {
|
|
|
List<StaticKnowledgeIndexDTO> retList = Lists.newLinkedList();
|
|
|
//静态知识检索顺序
|
|
|
List<DictionaryInfoDTO> dicStaticIndexList = dictionaryFacade.getListByGroupType(7);
|
|
@@ -124,7 +125,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(conceptIdList)) {
|
|
|
QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
|
|
|
- //conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
+ if (type.equals(0)) {
|
|
|
+ conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
+ }
|
|
|
conceptDetailQueryWrapper.in("concept_id", conceptIdList);
|
|
|
List<ConceptDetail> conceptDetailList = conceptDetailFacade.list(conceptDetailQueryWrapper);
|
|
|
Map<Long, List<ConceptDetail>> detailMap
|
|
@@ -141,9 +144,6 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
}
|
|
|
for (ConceptDetail detail : detailMap.get(item.getId())) {
|
|
|
item.setHasInfo(1);
|
|
|
- if (detail.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
|
|
|
- continue;
|
|
|
- }
|
|
|
List<String> contentTypeList = Arrays.asList(detail.getContentType().split(","));
|
|
|
if (contentTypeList.contains("1")) {
|
|
|
item.setHasStaticKnowledge(1);
|