diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
index 93c7f837..9f265603 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
@@ -1,6 +1,7 @@
 package com.glxp.api.controller.basic;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -8,6 +9,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.basic.BasicHospTypeEntity;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
 import com.glxp.api.req.basic.BasicHospTypeRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
@@ -15,7 +17,9 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicHospTypeResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.BasicHospTypeService;
+import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.util.StringUtils;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,15 +36,13 @@ public class BasicHospTypeController {
     BasicHospTypeService basicHospTypeService;
 
 
-
-
     @GetMapping("/udiwms/basic/hosp/type/filter")
     public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicHospTypeEntity> basicHospTypeEntities=basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest);
+        List<BasicHospTypeEntity> basicHospTypeEntities = basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest);
         PageInfo<BasicHospTypeEntity> pageInfo = new PageInfo<>(basicHospTypeEntities);
         PageSimpleResponse<BasicHospTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
@@ -55,21 +57,21 @@ public class BasicHospTypeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicHospTypeEntity> basicHospTypeEntities=basicHospTypeService.getMenuList(basicHospTypeFilterRequest);
+        List<BasicHospTypeEntity> basicHospTypeEntities = basicHospTypeService.getMenuList(basicHospTypeFilterRequest);
 
         return ResultVOUtils.success(basicHospTypeEntities);
     }
 
     @PostMapping("/udiwms/basic/hosp/type/save")
-    public BaseResponse save(@RequestBody  BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
+    public BaseResponse save(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Boolean falg=basicHospTypeService.saveBasicHospType(basicHospTypeRequest);
-        if(!falg){
-            return ResultVOUtils.error(999,"插入失败！");
+        Boolean falg = basicHospTypeService.saveBasicHospType(basicHospTypeRequest);
+        if (!falg) {
+            return ResultVOUtils.error(999, "插入失败！");
         }
         return ResultVOUtils.success();
     }
@@ -77,15 +79,15 @@ public class BasicHospTypeController {
 
     @PostMapping("/udiwms/basic/hosp/type/update")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
-    public BaseResponse update(@RequestBody  BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
+    public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Boolean falg=basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
-        if(!falg){
-            return ResultVOUtils.error(999,"更新失败！");
+        Boolean falg = basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
+        if (!falg) {
+            return ResultVOUtils.error(999, "更新失败！");
         }
         return ResultVOUtils.success();
     }
@@ -97,35 +99,58 @@ public class BasicHospTypeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-       String msg=basicHospTypeService.delectBasicHospType(basicHospTypeRequest);
+        String msg = basicHospTypeService.delectBasicHospType(basicHospTypeRequest);
 
-        if (StringUtils.isNotBlank(msg)){
-            return  ResultVOUtils.error(999,msg);
+        if (StringUtils.isNotBlank(msg)) {
+            return ResultVOUtils.error(999, msg);
         }
         return ResultVOUtils.success();
     }
 
     @GetMapping("/udiwms/basic/hosp/type/getTree")
     public BaseResponse getTree() {
-        List<BasicHospTypeResponse> basicHospTypeEntities=basicHospTypeService.getTreeList();
+        List<BasicHospTypeResponse> basicHospTypeEntities = basicHospTypeService.getTreeList();
         return ResultVOUtils.success(basicHospTypeEntities);
     }
 
     @PostMapping("/udiwms/basic/hosp/type/bindRel")
-    public BaseResponse saveRel(@RequestBody  BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
+    public BaseResponse saveRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Boolean falg=basicHospTypeService.bindHospProduct(basicHospTypeRequest);
+        Boolean falg = basicHospTypeService.bindHospProduct(basicHospTypeRequest);
         return ResultVOUtils.success();
     }
 
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+
     @GetMapping("/udiwms/basic/hosp/type/bindList")
     public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) {
 
-        filterUdiRelRequest.setDiType(1);
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
+            if (udiEntity != null) {
+                filterUdiRelRequest.setNameCode(udiEntity.getUdi());
+                filterUdiRelRequest.setUnionCode(udiEntity.getUdi());
+            }
+        }
+        //如果输入DI标识，精确找到不同层级对应的产品信息
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
+            FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
+            filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+                filterUdiRelRequest.setUnionCode(null);
+            }
+        } else {
+            //只查找主标识产品信息
+            filterUdiRelRequest.setDiType(1);
+        }
         List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -137,13 +162,13 @@ public class BasicHospTypeController {
 
     @PostMapping("/udiwms/basic/hosp/type/unbindRel")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
-    public BaseResponse unbindRel(@RequestBody  BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
+    public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Boolean falg=basicHospTypeService.unbindHospProduct(basicHospTypeRequest);
+        Boolean falg = basicHospTypeService.unbindHospProduct(basicHospTypeRequest);
         return ResultVOUtils.success();
     }