diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index 69f538a6..34868d3d 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -73,6 +73,23 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(responses);
     }
 
+    /**
+     * 获取仓库列表
+     *
+     * @param filterInvSubWarehouseRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/sub/inv/warehouse/filterOptimize")
+    public BaseResponse filterOptimize(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
+        List<InvSubWarehouseResponse> responses = invWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
+        List<DictDto> reList = responses.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 获取部门底下仓库列表-关联用户
      *
diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
index 554f05d5..6a409349 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
@@ -17,6 +17,7 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.constant.SocketMsgType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.controller.sync.SpsSyncWebSocket;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.sync.SocketMsgEntity;
@@ -53,6 +54,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 单据类型接口
@@ -258,6 +260,58 @@ public class BasicBussinessTypeController extends BaseController {
 
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/localBusType/filterJoinByUserOptimize")
+    public BaseResponse filterJoinByUserOptimize(FilterBussinessTypeRequest bussinessTypeFilterRequest,
+                                                 BindingResult bindingResult) {
+        List<DictDto> reList  = new ArrayList<>();
+        if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
+            List<BasicBussinessTypeEntity> result = new ArrayList<>();
+            List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());
+            if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getInvCode()) || StrUtil.isNotEmpty(bussinessTypeFilterRequest.getCode())) {
+                //过滤是否是当前仓库底下单据类型
+                FilterBussinessTypeRequest tempRequest = new FilterBussinessTypeRequest();
+                tempRequest.setCode(bussinessTypeFilterRequest.getCode());
+                tempRequest.setInvCode(bussinessTypeFilterRequest.getInvCode());
+                tempRequest.setMainAction(bussinessTypeFilterRequest.getMainAction());
+                List<BasicBussinessTypeResponse> bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(tempRequest);
+                if (CollUtil.isNotEmpty(bussinessTypeResponses)) {
+                    for (BasicBussinessTypeResponse bussinessTypExportResponse : bussinessTypeResponses) {
+                        for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessTypeEntities) {
+                            if (bussinessTypExportResponse.getAction().equals(basicBussinessTypeEntity.getAction())) {
+                                result.add(basicBussinessTypeEntity);
+                            }
+                        }
+                    }
+
+                }
+            } else {
+                result.addAll(bussinessTypeEntities);
+            }
+
+            reList = result.stream().map(s-> {
+                DictDto dictDto = new DictDto(s.getAction(),s.getName());
+                return dictDto;
+            }).collect(Collectors.toList());
+        } else {
+
+            List<BasicBussinessTypeResponse> bussinessTypeEntities;
+            //判断是否是医院用户
+            bussinessTypeFilterRequest.setUserId(getUserId());
+            bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
+                    bussinessTypeFilterRequest);
+
+            reList = bussinessTypeEntities.stream().map(s-> {
+                DictDto dictDto = new DictDto(s.getAction(),s.getName());
+                return dictDto;
+            }).collect(Collectors.toList());
+
+        }
+        return ResultVOUtils.success(reList);
+
+    }
+
+
     @Resource
     IoOrderService orderService;
     @Resource