Przeglądaj źródła

解决空指针异常

zhoutg 5 lat temu
rodzic
commit
b1baadf84b

+ 5 - 0
data-service/src/main/java/com/diagbot/facade/SearchFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.vo.ScaleIndexVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +37,9 @@ public class SearchFacade {
         GetStaticKnowledgeVO getStaticKnowledgeVO = new GetStaticKnowledgeVO();
         BeanUtil.copyProperties(getStaticVO, getStaticKnowledgeVO);
         List<Integer> types = getStaticKnowledgeVO.getTypes();
+        if (null == types) {
+            types = new ArrayList<>();
+        }
         if (ListUtil.isEmpty(types)) {
             // 添加词库搜索类型
             types.add(StaticSearchTypeEnum.DIAGNOSIS.getKey());
@@ -44,6 +48,7 @@ public class SearchFacade {
             types.add(StaticSearchTypeEnum.LIS_PACKAGE.getKey());
             types.add(StaticSearchTypeEnum.PACS_ITEMS.getKey());
             types.add(StaticSearchTypeEnum.OPERATION.getKey());
+            getStaticKnowledgeVO.setTypes(types);
         }
         RespDTO<List<RetrievalDTO>> res
                 = aiptServiceClient.getStaticKnowledge(getStaticKnowledgeVO);

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

@@ -171,6 +171,9 @@ public class RetrievalFacade {
      */
     public void searchTypeToTagType(List<Integer> typeList, GetStaticKnowledgeVO getStaticKnowledgeVO) {
         List<Integer> types = getStaticKnowledgeVO.getTypes();
+        if (null == types) {
+            types = new ArrayList<>();
+        }
         if (ListUtil.isEmpty(types)) {
             // 添加标签类型
             typeList.add(ConceptTypeEnum.Symptom.getKey());
@@ -183,6 +186,7 @@ public class RetrievalFacade {
             types.add(StaticSearchTypeEnum.LIS_PACKAGE.getKey());
             types.add(StaticSearchTypeEnum.PACS_ITEMS.getKey());
             types.add(StaticSearchTypeEnum.OPERATION.getKey());
+            getStaticKnowledgeVO.setTypes(types);
             return ;
         }
         for (Integer t : types) {