诊断依据bug处理

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -1002,13 +1002,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         List<String> res = new ArrayList<>();
         List<Integer> typeList =
                 DiagnoseTypeConvertUtil.diagnoseType2LibType(diagnoseSearchVO.getType(), diagnoseSearchVO.getField());
+        diagnoseSearchVO.setTypeList(typeList);
         if (ListUtil.isNotEmpty(typeList)) {
-            List<LibraryInfo> libraryInfoList = libraryInfoFacade.list(new QueryWrapper<LibraryInfo>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("type_id", typeList)
-                    .and(wrapper -> wrapper.like("name", diagnoseSearchVO.getName())
-                            .or().like("spell", diagnoseSearchVO.getName()))
-            );
+            List<LibraryInfo> libraryInfoList = this.search(diagnoseSearchVO);
             res = libraryInfoList.stream().map(row -> row.getName()).collect(Collectors.toList());
         }
         return res;

knowledgeman-service/src/main/java/com/diagbot/mapper/DiagnoseMapper.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.DiagnosePageDTO;
 import com.diagbot.entity.Diagnose;
+import com.diagbot.entity.LibraryInfo;
 import com.diagbot.vo.DiagnosePageVO;
+import com.diagbot.vo.DiagnoseSearchVO;
 import com.diagbot.vo.DiseaseIndexVO;
 
 import java.util.List;
@@ -45,4 +47,12 @@ public interface DiagnoseMapper extends BaseMapper<Diagnose> {
      */
     public void updateBatch(List<Diagnose> diagnoseList);
 
+
+    /**
+     * 诊断依据检索标准词和关联词
+     *
+     * @param diagnoseSearchVO
+     */
+    public List<LibraryInfo> search(DiagnoseSearchVO diagnoseSearchVO);
+
 }

knowledgeman-service/src/main/java/com/diagbot/service/DiagnoseService.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.DiagnosePageDTO;
 import com.diagbot.entity.Diagnose;
+import com.diagbot.entity.LibraryInfo;
 import com.diagbot.vo.DiagnosePageVO;
+import com.diagbot.vo.DiagnoseSearchVO;
 import com.diagbot.vo.DiseaseIndexVO;
 
 import java.util.List;
@@ -45,4 +47,11 @@ public interface DiagnoseService extends IService<Diagnose> {
      */
     public void updateBatch(List<Diagnose> diagnoseList);
 
+
+    /**
+     * 诊断依据检索标准词和关联词
+     * @param diagnoseSearchVO
+     */
+    public List<LibraryInfo> search(DiagnoseSearchVO diagnoseSearchVO);
+
 }

knowledgeman-service/src/main/java/com/diagbot/service/impl/DiagnoseServiceImpl.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.DiagnosePageDTO;
 import com.diagbot.entity.Diagnose;
+import com.diagbot.entity.LibraryInfo;
 import com.diagbot.mapper.DiagnoseMapper;
 import com.diagbot.service.DiagnoseService;
 import com.diagbot.vo.DiagnosePageVO;
+import com.diagbot.vo.DiagnoseSearchVO;
 import com.diagbot.vo.DiseaseIndexVO;
 import org.springframework.stereotype.Service;
 
@@ -38,4 +40,9 @@ public class DiagnoseServiceImpl extends ServiceImpl<DiagnoseMapper, Diagnose> i
     public void updateBatch(List<Diagnose> diagnoseList) {
         baseMapper.updateBatch(diagnoseList);
     }
+
+    @Override
+    public List<LibraryInfo> search(DiagnoseSearchVO diagnoseSearchVO) {
+        return baseMapper.search(diagnoseSearchVO);
+    }
 }

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnoseSearchVO.java

@@ -37,4 +37,7 @@ public class DiagnoseSearchVO implements Serializable {
     @ApiModelProperty(value = "搜索内容")
     @NotBlank(message="搜索内容不能为空")
     private String name;
+
+    @ApiModelProperty(hidden = true, value = "搜索的类型")
+    private List<Integer> typeList;
 }

knowledgeman-service/src/main/resources/mapper/DiagnoseMapper.xml

@@ -58,4 +58,18 @@
         </foreach>
     </update>
 
+
+    <select id="search" resultType="com.diagbot.vo.DiagnoseSearchVO">
+        SELECT a.* FROM kl_library_info a, kl_concept b
+        WHERE a.is_deleted = 'N' and b.is_deleted = 'N'
+        AND a.concept_id = b.id
+        <if test="typeList != null and typeList.size() > 0">
+            AND a.type_id in
+            <foreach  collection="typeList" item="item" open="("  separator=","  close=")">
+                #{item}
+            </foreach>
+        </if>
+        AND (a.NAME LIKE  #{name} OR a.spell LIKE #{name})
+    </select>
+
 </mapper>