检索修改

aipt-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -206,7 +206,9 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<ConceptRetrievalDTO> retrivelConceptInfo(RetrievalVO retrievalVO){
-        retrievalVO.setType(ParamConvertUtil.conceptConvert2Lib(retrievalVO.getType()));//标签类型
+        if (null != retrievalVO.getType()){
+            retrievalVO.setType(ParamConvertUtil.conceptConvert2Lib(retrievalVO.getType()));//标签类型
+        }
         List<ConceptRetrievalDTO> conceptRetrievalDTOS = this.retrievalConcept(retrievalVO);
         //把本体的sameName过滤掉
         for (ConceptRetrievalDTO conceptRetrievalDTO : conceptRetrievalDTOS) {

aipt-service/src/main/java/com/diagbot/vo/RetrievalVO.java

@@ -14,13 +14,10 @@ import java.util.List;
 @Getter
 @Setter
 public class RetrievalVO {
-    @NotNull(message = "请输入标签类型")
     private Integer type;
-    @NotNull(message = "请输入病人年龄")
     private Integer age;
     @NotNull(message = "请输入症状")
     private String InputStr;
-    @NotNull(message = "请输入病人性别")
     private Integer sexType;
     //需要去重的id
     private List<Long> inputIds;

aipt-service/src/main/resources/mapper/ConceptMapper.xml

@@ -201,7 +201,9 @@
         AND t4.is_deleted = 'N'
         AND t5.is_deleted = 'N'
         AND t6.is_deleted = 'N'
-        AND t1.lib_type = #{type}
+        <if test="type != null">
+            AND t1.lib_type = #{type}
+        </if>
         <if test="sexType == 3">
         and t3.sex_type in ('1','2','3')
         </if>
@@ -234,7 +236,9 @@
         AND t4.is_deleted = 'N'
         AND t5.is_deleted = 'N'
         AND t6.is_deleted = 'N'
-        AND t1.lib_type = #{type}
+        <if test="type != null">
+            AND t1.lib_type = #{type}
+        </if>
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
         </if>
@@ -267,7 +271,9 @@
         AND t4.is_deleted = 'N'
         AND t5.is_deleted = 'N'
         AND t6.is_deleted = 'N'
-        AND t1.lib_type = #{type}
+        <if test="type != null">
+            AND t1.lib_type = #{type}
+        </if>
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
         </if>
@@ -296,7 +302,9 @@
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t6.is_deleted = 'N'
-        AND t1.lib_type = #{type}
+        <if test="type != null">
+            AND t1.lib_type = #{type}
+        </if>
         <if test="sexType == 3">
         and t3.sex_type in ('1','2','3')
         </if>
@@ -324,7 +332,9 @@
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t6.is_deleted = 'N'
-        AND t1.lib_type = #{type}
+        <if test="type != null">
+            AND t1.lib_type = #{type}
+        </if>
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
         </if>
@@ -352,7 +362,9 @@
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t6.is_deleted = 'N'
-        AND t1.lib_type = #{type}
+        <if test="type != null">
+            AND t1.lib_type = #{type}
+        </if>
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
         </if>

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

@@ -13,9 +13,7 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.vo.RetrievalVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +38,7 @@ public class RetrievalFacade {
      * @param retrievalVO
      * @return
      */
-    public List<RetrievalDTO> getTagInfos(@Valid @RequestBody RetrievalVO retrievalVO) {
+    public List<RetrievalDTO> getTagInfos(RetrievalVO retrievalVO) {
         List<RetrievalDTO> retrievalDTOS = new ArrayList<>();
         //调用aipt-服务
         RespDTO<List<ConceptRetrievalDTO>> conceptInfos = aiptServiceClient.retrivelConceptInfo(retrievalVO);