12/16 器械选入的规格型号

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -493,9 +493,12 @@ public class UdiContrastService {
                 udiProductEntity.setNameCode(thrProductsEntity.getCode());
                 udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
                 udiProductEntity.setPackUnit(thrProductsEntity.getMeasname());
-                udiProductEntity.setGgxh(basicInsMaterialEntity != null ? basicInsMaterialEntity.getSpecification() : thrProductsEntity.getSpec());
+                if (basicInsMaterialEntity != null){
-                udiProductEntity.setManufactory(basicInsMaterialEntity != null ? basicInsMaterialEntity.getManufacturerName() : thrProductsEntity.getManufactory());
+                    udiProductEntity.setGgxh(basicInsMaterialEntity.getSpecification() != null ? basicInsMaterialEntity.getSpecification() : thrProductsEntity.getSpec());
-                udiProductEntity.setBzgg(thrProductsEntity.getSpec());
+                    udiProductEntity.setManufactory(basicInsMaterialEntity.getManufacturerName() != null ? basicInsMaterialEntity.getManufacturerName() : thrProductsEntity.getManufactory());
+                }
+
+//                udiProductEntity.setBzgg(thrProductsEntity.getSpec());
                 udiProductEntity.setCpmctymc(thrProductsEntity.getName());
                 udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
                 //包装单位