Revert "辅检检索结果带类型"

This reverts commit 32c127d

src/main/java/com/diagbot/dto/PacsInfoDTO.java

@@ -1,16 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/12/10 14:08
- */
-@Getter
-@Setter
-public class PacsInfoDTO {
-    private String name;
-    private Integer type;
-}

src/main/java/com/diagbot/dto/RetrievalDTO.java

@@ -24,7 +24,7 @@ public class RetrievalDTO {
     /**
      * 辅检
      */
-    private List<PacsInfoDTO> pacsNames;
+    private List<String> pacsNames;
     /**
      * 诊断
      */

src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -4,7 +4,6 @@ import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.DrugInfoDTO;
 import com.diagbot.dto.LisDetailDTO;
 import com.diagbot.dto.OperationInfoDTO;
-import com.diagbot.dto.PacsInfoDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.entity.BaseNodeInfo;
@@ -188,10 +187,10 @@ public class RetrievalFacade {
     /*
      * 获取辅检名称列表
      */
-    public List<PacsInfoDTO> getPACSs(String info, Integer size) {
+    public List<String> getPACSs(String info, Integer size) {
 
         PacsNameNode pacsNode = new PacsNameNode();
-        List<PacsInfoDTO> pacslist = pacsNode.getPACSNameAndPACSSubNameList(info, size, pacsRepository);
+        List<String> pacslist = pacsNode.getPACSNameAndPACSSubNameList(info, size, pacsRepository);
 
         return pacslist;
     }
@@ -294,10 +293,10 @@ public class RetrievalFacade {
     /*
      * 获取辅检名称列表
      */
-    public List<PacsInfoDTO> getPACSNames(String info, Integer size) {
+    public List<String> getPACSNames(String info, Integer size) {
 
         PacsNameNode pacsNode = new PacsNameNode();
-        List<PacsInfoDTO> pacslist = pacsNode.getPACSNameAndPACSSubNames(info, size, pacsRepository);
+        List<String> pacslist = pacsNode.getPACSNameAndPACSSubNames(info, size, pacsRepository);
 
         return pacslist;
     }

src/main/java/com/diagbot/repository/PacsNameNode.java

@@ -2,7 +2,6 @@ package com.diagbot.repository;
 
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.PacsBillNeoDTO;
-import com.diagbot.dto.PacsInfoDTO;
 import com.diagbot.entity.BaseNodeInfo;
 import com.diagbot.entity.node.*;
 import com.diagbot.entity.relationship.*;
@@ -34,7 +33,6 @@ import com.diagbot.entity.relationship.PacsNamePacsDescribe;
 import com.diagbot.entity.relationship.PacsNameVital;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
-import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -337,7 +335,7 @@ public class PacsNameNode {
     /**
      * 获取辅检名称列表
      */
-    public List<PacsInfoDTO> getPACSNameAndPACSSubNameList(String name, Integer size, PacsNameRepository pacsRepository) {
+    public List<String> getPACSNameAndPACSSubNameList(String name, Integer size, PacsNameRepository pacsRepository) {
 
         List<String> pacslist = new ArrayList<>();
         if (null == size) {
@@ -349,29 +347,16 @@ public class PacsNameNode {
             pacslt = pacslt.subList(0, size);
         }
 
-        List<PacsInfoDTO> retPacslt = Lists.newLinkedList();
-        for (BaseNodeInfo baseNodeInfo : pacslt) {
-            PacsInfoDTO pacsInfoDTO = new PacsInfoDTO();
-            pacsInfoDTO.setName(baseNodeInfo.getName());
-            if (baseNodeInfo.getLabels() != null && baseNodeInfo.getLabels().size() > 0) {
-                if (baseNodeInfo.getLabels().contains("辅助检查名称")) {
-                    pacsInfoDTO.setType(3);
-                } else if (baseNodeInfo.getLabels().contains("辅助检查子项目名称")) {
-                    pacsInfoDTO.setType(10);
-                }
-            }
-            retPacslt.add(pacsInfoDTO);
-        }
-        //pacslist = pacslt.stream().map(i -> i.getName()).collect(Collectors.toList());
+        pacslist = pacslt.stream().map(i -> i.getName()).collect(Collectors.toList());
 
-        return retPacslt;
+        return pacslist;
     }
 
 
     /**
      * 获取辅检及子项目名称列表
      */
-    public List<PacsInfoDTO> getPACSNameAndPACSSubNames(String name, Integer size, PacsNameRepository pacsRepository) {
+    public List<String> getPACSNameAndPACSSubNames(String name, Integer size, PacsNameRepository pacsRepository) {
 
         List<String> pacslist;
         if (null == size || size == 0) {
@@ -380,16 +365,7 @@ public class PacsNameNode {
 
         pacslist = pacsRepository.getPACSNames(size);
 
-        List<PacsInfoDTO> retList = Lists.newLinkedList();
-        if (ListUtil.isNotEmpty(pacslist)) {
-            for (String pacsStr : pacslist) {
-                PacsInfoDTO pacsInfoDTO = new PacsInfoDTO();
-                pacsInfoDTO.setName(pacsStr);
-                retList.add(pacsInfoDTO);
-            }
-        }
-
-        return retList;
+        return pacslist;
     }
 
 

src/main/java/com/diagbot/web/RetrievalController.java

@@ -35,7 +35,7 @@ public class RetrievalController {
     private ConceptFacade conceptFacade;
 
     @ApiOperation(value = "术语检索[zhaops]",
-            notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-检查子项 <br>" +
+            notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状 <br>" +
                     "inputStr： 检索内容<br>" +
                     "sex： 性别：1-男、2-女、3-通用 <br>" +
                     "age： 年龄<br>")