代码优化

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

@@ -7,8 +7,8 @@ import com.diagbot.dto.OrderRetrivevalDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.entity.QuestionInfo;
+import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
@@ -104,8 +104,8 @@ public class RetrievalFacade {
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             retrievalDTO = retrievalDTOIterator.next();
                 if(retrievalDTO.getQuestionId() == null
-                        && retrievalDTO.getType().intValue() != QuestionTypeEnum.Pacs.getKey()
-                        && retrievalDTO.getType().intValue() != QuestionTypeEnum.Disease.getKey()){
+                        && retrievalDTO.getType().intValue() != ConceptTypeEnum.Pacs.getKey()
+                        && retrievalDTO.getType().intValue() != ConceptTypeEnum.Disease.getKey()){
                         retrievalDTOIterator.remove();
                 }
         }
@@ -123,10 +123,10 @@ public class RetrievalFacade {
         BeanUtil.copyProperties(getStaticVO,getStaticKnowledgeVO);
         //标签类型
         List<Integer> typeList = new ArrayList<>();//规定标签类型，只取诊断，化验，辅检，药品类型
-        typeList.add(QuestionTypeEnum.Disease.getKey());
-        typeList.add(QuestionTypeEnum.Drug.getKey());
-        typeList.add(QuestionTypeEnum.Lis.getKey());
-        typeList.add(QuestionTypeEnum.Pacs.getKey());
+        typeList.add(ConceptTypeEnum.Disease.getKey());
+        typeList.add(ConceptTypeEnum.Drug.getKey());
+        typeList.add(ConceptTypeEnum.Lis.getKey());
+        typeList.add(ConceptTypeEnum.Pacs.getKey());
         getStaticKnowledgeVO.setTypes(typeList);
         //调用aipt-service获取有静态知识的标签
         RespDTO<List<RetrievalDTO>> retrievalDTOList = aiptServiceClient.getStaticKnowledge(getStaticKnowledgeVO);
@@ -155,11 +155,11 @@ public class RetrievalFacade {
                 OrderRetrivevalDTO orderRetrivevalDTO = new OrderRetrivevalDTO();
                 BeanUtil.copyProperties(retrievalDTOInfo, orderRetrivevalDTO);
                 //排序号设定
-                if(orderRetrivevalDTO.getType().intValue() == QuestionTypeEnum.Disease.getKey()){//诊断
+                if(orderRetrivevalDTO.getType().intValue() == ConceptTypeEnum.Disease.getKey()){//诊断
                     orderRetrivevalDTO.setOrderNo(1);
-                }else if(orderRetrivevalDTO.getType().intValue() == QuestionTypeEnum.Drug.getKey()){//药品
+                }else if(orderRetrivevalDTO.getType().intValue() == ConceptTypeEnum.Drug.getKey()){//药品
                     orderRetrivevalDTO.setOrderNo(2);
-                }else if(orderRetrivevalDTO.getType().intValue() == QuestionTypeEnum.Lis.getKey()){//化验
+                }else if(orderRetrivevalDTO.getType().intValue() == ConceptTypeEnum.Lis.getKey() || orderRetrivevalDTO.getType().intValue() == ConceptTypeEnum.LisDetail.getKey()){//化验
                     orderRetrivevalDTO.setOrderNo(3);
                 }else {//辅检
                     orderRetrivevalDTO.setOrderNo(4);