静态知识检索加入公表项

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

@@ -27,7 +27,6 @@ import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.ExistListByConceptIdsVO;
 import com.diagbot.vo.GetStaticKnowledgeVO;
 import com.diagbot.vo.RetrievalVO;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -345,6 +344,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         BeanUtil.copyProperties(getStaticKnowledgeVO,retrievalVO);
         retrievalVO.setIsStatic(1);
         List<Integer> types = new ArrayList<>();
+        types.add(LexiconTypeEnum.LIS_TABLES.getKey());
         for (Integer type : getStaticKnowledgeVO.getTypes()) {
             types.add(ParamConvertUtil.conceptConvert2Lib(type));
         }
@@ -362,6 +362,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                 retrievalDTO.setConceptId(conceptRetrievalDTO.getSelfId());
                 retrievalDTO.setName(conceptRetrievalDTO.getSelfName());
                 if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//parent不为空时说明有子项，返回父级id
+                    retrievalDTO.setConceptId(conceptRetrievalDTO.getParentId());
                     retrievalDTO.setName(conceptRetrievalDTO.getParentName());
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSelfName());
                 }

icss-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -127,6 +127,7 @@ public class RetrievalFacade {
         typeList.add(QuestionTypeEnum.Drug.getKey());
         typeList.add(QuestionTypeEnum.Lis.getKey());
         typeList.add(QuestionTypeEnum.Pacs.getKey());
+        typeList.add(QuestionTypeEnum.Pacs.getKey());
         getStaticKnowledgeVO.setTypes(typeList);
         //调用aipt-service获取有静态知识的标签
         RespDTO<List<RetrievalDTO>> retrievalDTOList = aiptServiceClient.getStaticKnowledge(getStaticKnowledgeVO);