Procházet zdrojové kódy

Revert "辅检术语检索修改"

This reverts commit eb98cec
zhaops před 4 roky
rodič
revize
a4cea95215

+ 0 - 16
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;
-}

+ 1 - 1
src/main/java/com/diagbot/dto/RetrievalDTO.java

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

+ 2 - 12
src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.CdssCoreClient;
-import com.diagbot.dto.PacsInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.PacsConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -478,19 +477,10 @@ public class PacsConfigFacade {
      * @param retrievalVO
      * @return
      */
-    public List<PacsInfoDTO> getPACSs(RetrievalVO retrievalVO) {
+    public List<String> getPACSs(RetrievalVO retrievalVO) {
         List<PacsConfig> records = pacsConfigService.getPACSsIndex(retrievalVO);
         List<String> pacsNames
                 = records.stream().map(r -> r.getHisName()).distinct().collect(Collectors.toList());
-        List<PacsInfoDTO> retList=Lists.newLinkedList();
-        if(ListUtil.isNotEmpty(pacsNames)){
-            for(String pacsName:pacsNames){
-                PacsInfoDTO pacsInfoDTO=new PacsInfoDTO();
-                pacsInfoDTO.setName(pacsName);
-                pacsInfoDTO.setType(3);
-                retList.add(pacsInfoDTO);
-            }
-        }
-        return retList;
+        return pacsNames;
     }
 }

+ 1 - 1
src/main/java/com/diagbot/web/RetrievalController.java

@@ -28,7 +28,7 @@ public class RetrievalController {
     private RetrievalFacade retrievalFacade;
 
     @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-输血 <br>" +
                     "inputStr: 检索内容<br>" +
                     "sex: 性别:1-男、2-女、3-通用 <br>" +
                     "age: 年龄<br>")