诊断、手术、药品信息删除接口添加

daqe-center/src/main/java/com/lantone/daqe/facade/DiseaseManagementFacade.java

@@ -84,16 +84,18 @@ public class DiseaseManagementFacade {
     }
 
     /**
+     * 通过id删除诊断
+     *
      * @param delDiseaseByIdVO
-     * @Description删除诊断
-     * @Return java.lang.Boolean
+     * @return 是否删除成功
      */
     public Boolean delDiseaseById(DelDiseaseByIdVO delDiseaseByIdVO) {
-
-        return false;
+        if (diseaseInfoFacade.getById(delDiseaseByIdVO.getId()) == null) {
+            Asserts.fail("该诊断不存在！");
+        }
+        return diseaseInfoFacade.removeById(delDiseaseByIdVO.getId());
     }
 
-
     /**
      * @param matchingDiseaseVO
      * @Description

daqe-center/src/main/java/com/lantone/daqe/facade/DrugManagementFacade.java

@@ -10,6 +10,7 @@ import com.lantone.daqe.dto.GetDrugPageDTO;
 import com.lantone.daqe.entity.DrugInfo;
 import com.lantone.daqe.facade.base.DrugInfoFacade;
 import com.lantone.daqe.vo.AddDrugVO;
+import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -71,4 +72,17 @@ public class DrugManagementFacade {
         return drugInfoFacade.save(drugInfo);
     }
 
+    /**
+     * 通过id删除药品
+     *
+     * @param delDrugByIdVO
+     * @return 是否删除成功
+     */
+    public Boolean delDrugById(DelDrugByIdVO delDrugByIdVO) {
+        if (drugInfoFacade.getById(delDrugByIdVO.getId()) == null) {
+            Asserts.fail("该药品不存在！");
+        }
+        return drugInfoFacade.removeById(delDrugByIdVO.getId());
+    }
+
 }

daqe-center/src/main/java/com/lantone/daqe/facade/OperationManagementFacade.java

@@ -10,6 +10,7 @@ import com.lantone.daqe.dto.GetOperationPageDTO;
 import com.lantone.daqe.entity.OperationInfo;
 import com.lantone.daqe.facade.base.OperationInfoFacade;
 import com.lantone.daqe.vo.AddOperationVO;
+import com.lantone.daqe.vo.DelOperationByIdVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -69,4 +70,17 @@ public class OperationManagementFacade {
         return operationInfoFacade.save(operationInfo);
     }
 
+    /**
+     * 通过id删除手术
+     *
+     * @param delOperationByIdVO
+     * @return 是否删除成功
+     */
+    public Boolean delOperationById(DelOperationByIdVO delOperationByIdVO) {
+        if (operationInfoFacade.getById(delOperationByIdVO.getId()) == null) {
+            Asserts.fail("该药品不存在！");
+        }
+        return operationInfoFacade.removeById(delOperationByIdVO.getId());
+    }
+
 }

daqe-center/src/main/java/com/lantone/daqe/vo/DelDiseaseByIdVO.java

@@ -2,28 +2,26 @@ package com.lantone.daqe.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
- * @Description:删除诊断-接口入参
- * @Author songxl
- * @Date 2022/2/28
+ * @Description: 通过id删除诊断-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
  */
-@ApiModel(value = "删除诊断-接口入参")
+@ApiModel(value = "通过id删除诊断-接口入参")
 @Getter
 @Setter
 public class DelDiseaseByIdVO implements Serializable {
+
     private static final long serialVersionUID = 5262000808815034181L;
 
-    @ApiModelProperty(value = "诊断ID", required = true)
-    @NotNull(message = "诊断ID不能为空")
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
     private Long id;
 
-
-}
+}

daqe-center/src/main/java/com/lantone/daqe/vo/DelDrugByIdVO.java

@@ -0,0 +1,27 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 通过id删除药品-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
+ */
+@ApiModel(value = "通过id删除药品-接口入参")
+@Getter
+@Setter
+public class DelDrugByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/DelOperationByIdVO.java

@@ -0,0 +1,27 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 通过id删除手术-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
+ */
+@ApiModel(value = "通过id删除手术-接口入参")
+@Getter
+@Setter
+public class DelOperationByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+}

daqe-center/src/main/java/com/lantone/daqe/web/DiseaseManagementController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @Description: 诊断管理API
  * @author: songxl
@@ -38,7 +40,7 @@ public class DiseaseManagementController {
 
     @ApiOperation(value = "新增诊断 [by:songxl]")
     @PostMapping("/addDisease")
-    public CommonResult<Boolean> addDisease(@RequestBody AddDiseaseVO addDiseaseVO) {
+    public CommonResult<Boolean> addDisease(@RequestBody @Valid AddDiseaseVO addDiseaseVO) {
         return CommonResult.success(diseaseManagementFacade.addDisease(addDiseaseVO));
     }
 
@@ -48,9 +50,9 @@ public class DiseaseManagementController {
         return CommonResult.success(diseaseManagementFacade.upDiseaseById(upDiseaseByIdVO));
     }
 
-    @ApiOperation(value = "删除诊断 [by:songxl]")
+    @ApiOperation(value = "通过id删除诊断 [by:songxl]")
     @PostMapping("/delDiseaseById")
-    public CommonResult<Boolean> delDiseaseById(@RequestBody DelDiseaseByIdVO delDiseaseByIdVO) {
+    public CommonResult<Boolean> delDiseaseById(@RequestBody @Valid DelDiseaseByIdVO delDiseaseByIdVO) {
         return CommonResult.success(diseaseManagementFacade.delDiseaseById(delDiseaseByIdVO));
     }
 

daqe-center/src/main/java/com/lantone/daqe/web/DrugManagementController.java

@@ -5,6 +5,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetDrugPageDTO;
 import com.lantone.daqe.facade.DrugManagementFacade;
 import com.lantone.daqe.vo.AddDrugVO;
+import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @Description: 药品管理API
  * @author: songxl
@@ -35,8 +38,14 @@ public class DrugManagementController {
 
     @ApiOperation(value = "新增药品 [by:songxl]")
     @PostMapping("/addDrug")
-    public CommonResult<Boolean> addDrug(@RequestBody AddDrugVO addDrugVO) {
+    public CommonResult<Boolean> addDrug(@RequestBody @Valid AddDrugVO addDrugVO) {
         return CommonResult.success(drugManagementFacade.addDrug(addDrugVO));
     }
 
+    @ApiOperation(value = "通过id删除药品 [by:songxl]")
+    @PostMapping("/delDrugById")
+    public CommonResult<Boolean> delDrugById(@RequestBody @Valid DelDrugByIdVO delDrugByIdVO) {
+        return CommonResult.success(drugManagementFacade.delDrugById(delDrugByIdVO));
+    }
+
 }

daqe-center/src/main/java/com/lantone/daqe/web/OperationManagementController.java

@@ -5,6 +5,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetOperationPageDTO;
 import com.lantone.daqe.facade.OperationManagementFacade;
 import com.lantone.daqe.vo.AddOperationVO;
+import com.lantone.daqe.vo.DelOperationByIdVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @Description: 手术管理API
  * @author: songxl
@@ -35,8 +38,14 @@ public class OperationManagementController {
 
     @ApiOperation(value = "新增手术 [by:songxl]")
     @PostMapping("/addOperation")
-    public CommonResult<Boolean> addOperation(@RequestBody AddOperationVO addOperationVO) {
+    public CommonResult<Boolean> addOperation(@RequestBody @Valid AddOperationVO addOperationVO) {
         return CommonResult.success(operationManagementFacade.addOperation(addOperationVO));
     }
 
+    @ApiOperation(value = "通过id删除手术 [by:songxl]")
+    @PostMapping("/delOperationById")
+    public CommonResult<Boolean> delOperationById(@RequestBody @Valid DelOperationByIdVO delOperationByIdVO) {
+        return CommonResult.success(operationManagementFacade.delOperationById(delOperationByIdVO));
+    }
+
 }