更新术语静态知识和医学知识删除接口

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

@@ -141,11 +141,15 @@ public class MedicalFacade extends MedicalServiceImpl {
      * @param termVo
      * @return ConceptDTO
      */
-    public Boolean removeMedicalInfo(TermVo termVo) {
+    public ConceptDTO removeMedicalInfo(TermVo termVo) {
 
-        Boolean isdeleted = false;
-        List<Medical> medicals;
+//        Boolean isdeleted = false;
+        ConceptDTO conceptDTO = new ConceptDTO();
+        Medical medical;
+        List<String> msg = new ArrayList<>();
+        String error = "";
 
+        /*
         QueryWrapper<LibraryInfo> query = new QueryWrapper<>();
         query.eq("name", termVo.getTerm());
         query.eq("type", termVo.getType());
@@ -165,8 +169,23 @@ public class MedicalFacade extends MedicalServiceImpl {
                 isdeleted = true;
             }
         }
+        */
+        QueryWrapper<Medical> query = new QueryWrapper<>();
+        query.eq("id", termVo.getId());
+        medical = getOne(query);
 
-        return isdeleted;
+        if (medical != null) {
+            remove(query);
+        }
+        else {
+            error = "术语 \"" + termVo.getTerm() + "(" + termVo.getType() + ")\" 不存在!";
+        }
+
+
+        msg.add(error);
+        conceptDTO.setMessage(msg);
+
+        return conceptDTO;
     }
 
 

knowledgeman-service/src/main/java/com/diagbot/web/LibraryDetailController.java

@@ -4,12 +4,10 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.*;
-import com.diagbot.entity.Concept;
 import com.diagbot.facade.LibraryDetailFacade;
 import com.diagbot.vo.AmendTermVo;
 import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.KnowledgeVo;
-import com.diagbot.vo.TermVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

knowledgeman-service/src/main/java/com/diagbot/web/MedicalController.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.ConceptDTO;
 import com.diagbot.dto.LibraryInfoDTO;
 import com.diagbot.dto.MedicalDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.facade.MedicalFacade;
 import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
@@ -72,8 +73,8 @@ public class MedicalController {
     @PostMapping("/removeMedicalInfo")
     @SysLogger("removeMedicalInfo")
     public RespDTO<ConceptDTO> removeMedicalInfo(@Valid @RequestBody TermVo termVo) {
-        Boolean result = medicalFacade.removeMedicalInfo(termVo);
+        ConceptDTO data = medicalFacade.removeMedicalInfo(termVo);
 
-        return RespDTO.onSuc(result);
+        return RespDTO.onSuc(data);
     }
 }