Merge remote-tracking branch 'origin/dev_drug' into dev_drug

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -868,6 +868,7 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setInvCode(addOrderRequest.getInvCode());
                 orderEntity.setOrderType(addOrderRequest.getOrderType());
                 orderEntity.setBusType(bussinessTypeEntity.getBusType());
+                orderEntity.setProductType(udiRelevanceResponse.getProductsType());
                 orderService.insertOrder(orderEntity);
             }
             if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -144,7 +144,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
 
             IoOrderDetailCodeResponse resp = new IoOrderDetailCodeResponse();
             BeanUtil.copyProperties(ioOrderDetailCodeEntity, resp);
-            if (ioOrderDetailCodeEntity.getProductType() == 2){
+            if (ioOrderDetailCodeEntity.getProductType() == 2 ){
                 //增加药品数据
                 UdiProductEntity product = udiProductService.findByNameCode(ioOrderDetailCodeEntity.getNameCode());
                 resp.setBzgg(product.getBzgg());