Merge branch 'dev_fifo_z1' into dev_fifo_z

src/main/java/com/glxp/api/controller/thrsys/ThrInsFeeController.java

@@ -17,6 +17,8 @@ import com.glxp.api.service.thrsys.BasicInsMaterialService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -38,7 +40,7 @@ public class ThrInsFeeController {
     BasicInsMaterialService basicInsMaterialService;
 
     /**
-     * 中西药医保收费项目
+     * 中西药医保收费项目- 饮片
      *
      * @param thrInsChDrugFeeRequest
      * @param bindingResult
@@ -59,7 +61,7 @@ public class ThrInsFeeController {
     }
 
     /**
-     * 医保中药饮品收费项目
+     * 医保中药饮品收费项目 -- 西药中成药目录
      * @param thrInsDrugFeeRequest
      * @param bindingResult
      * @return
@@ -99,4 +101,64 @@ public class ThrInsFeeController {
     }
 
 
+    /**
+     * 删除医用耗材
+     * @param basicInsMaterialEntity
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/udiwms/thrInsFee/material/deleteMaterial")
+    public BaseResponse deleteMaterial(@RequestBody BasicInsMaterialEntity basicInsMaterialEntity,
+                                       BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        boolean b = basicInsMaterialService.removeById(basicInsMaterialEntity.getId());
+        if (!b){
+            return ResultVOUtils.error("删除失败");
+        }
+        return ResultVOUtils.success();
+    }
+
+
+    /**
+     * 删除中西药
+     * @param
+     * @param
+     * @return
+     */
+    @PostMapping("/udiwms/thrInsFee/material/deleteChDrug")
+    public BaseResponse deleteChDrug(@RequestBody BasicInsDrugEntity basicInsDrugEntity,
+                                       BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        boolean b = basicInsDrugService.removeById(basicInsDrugEntity.getId());
+        if (!b){
+            return ResultVOUtils.error("删除失败");
+        }
+        return ResultVOUtils.success();
+    }
+
+
+    /**
+     * 删除中药饮品
+     * @param basicInsChdrugEntity
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/udiwms/thrInsFee/material/deleteDrug")
+    public BaseResponse deleteDrug(@RequestBody BasicInsChdrugEntity basicInsChdrugEntity,
+                                       BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        boolean b = basicInsChdrugService.removeById(basicInsChdrugEntity.getId());
+        if (!b){
+            return ResultVOUtils.error("删除失败");
+        }
+        return ResultVOUtils.success();
+    }
+
+
 }