Просмотр исходного кода

更新术语基本信息查询接口,对单个术语查询改为精准查询

MarkHuang 6 лет назад
Родитель
Сommit
2718b59e29

+ 14 - 12
knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -44,35 +44,37 @@ public class ConceptFacade extends ConceptServiceImpl {
      * 获取医学术语基本信息
      *
      * @param termvo
-     * @return List<ConceptDTO>
+     * @return ConceptDTO
      */
-    public List<ConceptDTO> getConceptInfo(@RequestBody TermVo termvo) {
+    public ConceptDTO getConceptInfo(@RequestBody TermVo termvo) {
 
-        List<ConceptDTO> conceptDTOs = new ArrayList<>();
-        ConceptDTO conceptDTO;
+//        List<ConceptDTO> conceptDTOs = new ArrayList<>();
+        ConceptDTO conceptDTO = new ConceptDTO();
         List<LibraryInfo> libraryinfos;
 
         // 获取医学术语的基本信息
         QueryWrapper<LibraryInfo> query = new QueryWrapper<>();
-        query.like("name", termvo.getTerm());
+        query.eq("name", termvo.getTerm());
+        query.eq("type", termvo.getType());
         query.eq("is_concept", 1);
-        List<LibraryInfo> libraryInfos = libraryinfoFacade.list(query);
+        LibraryInfo libraryInfo = libraryinfoFacade.getOne(query);
 
-        for (LibraryInfo libraryInfo:libraryInfos) {
-            libraryinfos = new ArrayList<>();
+        if ( libraryInfo != null ) {
 
-            conceptDTO = new ConceptDTO();
             conceptDTO.setId(libraryInfo.getConceptId());
             conceptDTO.setLibId(libraryInfo.getId().intValue());
             conceptDTO.setName(libraryInfo.getName());
 
-            libraryinfos.add(libraryInfo);
+            query = new QueryWrapper<>();
+            query.eq("concept_id", libraryInfo.getConceptId());
+            query.isNull("is_concept");
+
+            libraryinfos = libraryinfoFacade.list(query);
             conceptDTO.setLibraryInfo(libraryinfos);
 
-            conceptDTOs.add(conceptDTO);
         }
 
-        return conceptDTOs;
+        return conceptDTO;
     }
 
 

+ 1 - 1
knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -61,7 +61,7 @@ public class ConceptController {
     @PostMapping("/getConceptInfo")
     @SysLogger("getConceptInfo")
     public RespDTO<List<ConceptDTO>> getConceptInfo(@Valid @RequestBody TermVo termvo) {
-        List<ConceptDTO> data = conceptFacade.getConceptInfo(termvo);
+        ConceptDTO data = conceptFacade.getConceptInfo(termvo);
 
         return RespDTO.onSuc(data);
     }