代码优化

icss-service/src/main/java/com/diagbot/web/RetrievalController.java

@@ -39,7 +39,7 @@ public class RetrievalController {
                     "age：年龄，必填<br>" +
                     "inputStr：检索内容，必填<br>" +
                     "sexType：性别，必填<br>" +
-                    "inputIds：需要去重的id<br>" +
+                    "inputIds：需要去重的conceptId<br>" +
                     "tagType: 标签标识<br>" +
                     "itemType: 元素类型<br>")
     @PostMapping("/getTagInfos")

triage-service/src/main/java/com/diagbot/dto/SymptomSearchDTO.java

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/5/29 13:14
+ */
+@Getter
+@Setter
+public class SymptomSearchDTO extends ConceptBaseDTO{
+    //同义词
+    private String searchName;
+}

triage-service/src/main/java/com/diagbot/facade/SymptomFacade.java

@@ -4,9 +4,11 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SymptomSearchDTO;
 import com.diagbot.entity.Symptom;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.SymptomSearchVO;
@@ -51,7 +53,7 @@ public class SymptomFacade {
      * @param symptomSearchVO
      * @return 检索的症状
      */
-    public List<Symptom> searchFac(SymptomSearchVO symptomSearchVO) {
+    public List<SymptomSearchDTO> searchFac(SymptomSearchVO symptomSearchVO) {
         //调用aipt-service服务
         RetrievalVO retrievalVO = new RetrievalVO();
         retrievalVO.setType(1);
@@ -60,14 +62,17 @@ public class SymptomFacade {
         retrievalVO.setSexType(symptomSearchVO.getSexType());
         RespDTO<List<ConceptRetrievalDTO>> condeptRerievalS = aiptServiceClient.retrivelConceptInfo(retrievalVO);
         RespDTOUtil.respNGDeal(condeptRerievalS, "获取标签失败");
-        List<Symptom> symptomList = new ArrayList<>();
-        Symptom symptom = new Symptom();
+        List<SymptomSearchDTO> symptomList = new ArrayList<>();
+        SymptomSearchDTO symptomSearchDTO = new SymptomSearchDTO();
         //封装
         for (ConceptRetrievalDTO conceptRetrievalDTO : condeptRerievalS.data) {
-            symptom = new Symptom();
-            symptom.setConceptId(conceptRetrievalDTO.getSelfId());
-            symptom.setName(conceptRetrievalDTO.getSelfName());
-            symptomList.add(symptom);
+            symptomSearchDTO = new SymptomSearchDTO();
+            symptomSearchDTO.setConceptId(conceptRetrievalDTO.getSelfId());
+            symptomSearchDTO.setName(conceptRetrievalDTO.getSelfName());
+            if (StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())) {//同义词
+                symptomSearchDTO.setSearchName(conceptRetrievalDTO.getSameName());
+            }
+            symptomList.add(symptomSearchDTO);
         }
         return symptomList;
     }

triage-service/src/main/java/com/diagbot/web/SymptomController.java

@@ -2,6 +2,7 @@ package com.diagbot.web;
 
 
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SymptomSearchDTO;
 import com.diagbot.entity.Symptom;
 import com.diagbot.facade.SymptomFacade;
 import com.diagbot.vo.SymptomSearchVO;
@@ -46,7 +47,7 @@ public class SymptomController {
                     "sexType：性别，1：男，2：女<br>" +
                     "age：年龄")
     @PostMapping("/search")
-    public RespDTO<List<Symptom>> search(@RequestBody @Valid SymptomSearchVO symptomSearchVO) {
+    public RespDTO<List<SymptomSearchDTO>> search(@RequestBody @Valid SymptomSearchVO symptomSearchVO) {
         return RespDTO.onSuc(symptomFacade.searchFac(symptomSearchVO));
     }