diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index 4dfbd1738..b6a75dfe9 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -249,7 +249,10 @@ public class UdiContrastService {
 
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
-        udiProductEntity.setNameCode(thrProductsEntity.getCode());
+        if (thrProductsEntity.getProductType() != 2){
+            //不是药品就设置namecode
+            udiProductEntity.setNameCode(thrProductsEntity.getCode());
+        }
         udiProductEntity.setCpmctymc(thrProductsEntity.getName());
         udiProductEntity.setManufactory(thrProductsEntity.getManufactory());
         udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 7430a5f14..edfc13e5a 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -456,29 +456,48 @@ public class UdiProductService {
         if (updateLevelDrugRequest.getRelId() != null) {
             UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(updateLevelDrugRequest.getRelId());
 
-            UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
-            if (udiProductEntity1 != null) {
-                //更新
-                udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
-                udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
-                udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
-                udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
-                udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
-                udiProductDao.updateById(udiProductEntity1);
-            } else {
-                //新增
-                udiProductEntity1 = udiProductDao.findByUuid(udiRelevanceEntity.getUuid());
-                udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
-                udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
-                udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
-                udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
-                udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
-                udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
-                udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
-                udiProductDao.insert(udiProductEntity1);
+            List<UdiProductEntity> byUuids = udiProductDao.findByUuids(updateLevelDrugRequest.getUuid());
+            UdiProductEntity udiProductEntity1 = null;
+            if (byUuids.size() == 1){
+                //只有一条药品数据
+                 udiProductEntity1 = byUuids.get(0);
+                if (udiProductEntity1!= null && udiProductEntity1.getNameCode() == null){
+                    //更新
+                    udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
+                    udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
+                    udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                    udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
+                    udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
+                    udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                    udiProductDao.updateById(udiProductEntity1);
+                }
             }
+             udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
+            //有药品数据 但是nameCode如果为空的话 院内新增的 更改nameCode
+                if (udiProductEntity1 != null) {
+                    //更新
+                    udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
+                    udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
+                    udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                    udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
+                    udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
+                    udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                    udiProductDao.updateById(udiProductEntity1);
+                } else {
+                    //新增
+                    udiProductEntity1 = udiProductDao.findByUuid(udiRelevanceEntity.getUuid());
+                    udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
+                    udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
+                    udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                    udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
+                    udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
+                    udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                    udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
+                    udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
+                    udiProductDao.insert(udiProductEntity1);
+                }
+
+
         } else {
             //必须先提交后才能保存
             UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());