diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 663bd99b4..4ed87caeb 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -224,7 +224,7 @@ public class FilterOrderRequest extends ListPageRequest {
     private Integer invoiceRegStatus;
 
     /**
-     * 产品类别
+     * 订单类型 1:器械 2:药品
      */
     private Integer productType;
 
@@ -234,4 +234,7 @@ public class FilterOrderRequest extends ListPageRequest {
     private String workPlaceCode;
 
     private String keyWords;
+
+
+
 }
diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
index f1bc91e2d..33a992998 100644
--- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
@@ -77,6 +77,9 @@ public class IoOrderInvoiceRequest  extends ListPageRequest {
      */
     private String endTime;
 
+    private Integer productType;
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
index 49a0a97e9..bfdbc3e71 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
@@ -193,5 +193,9 @@ public class IoOrderDetailBizResponse {
 
     private String action;
 
+    /**
+     * 最小包装单位
+     */
+    private String leastPackUnit;
 
 }
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
index 13b4db0dd..54fa03dea 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
@@ -95,6 +95,7 @@ public class IoOrderInvoiceResponse {
     private int reCount;
     private int count;
     private BigDecimal amout;
+    private String bzgg;
 
     public static final String COL_ID = "id";
 
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 81f32c934..65d304c75 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -609,6 +609,10 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
         return udiProductDao.selectListByUuid(uuid);
     }
 
+    public UdiProductEntity findProductByNameCode(String nameCode) {
+        return udiProductDao.findByNameCode(nameCode);
+    }
+
     public static class CountWrapper {
         private int count;
 
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 1feba28b4..2c0410c6e 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
-import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@@ -26,6 +25,7 @@ import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.BasicSkPrescribeDiService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.InvPreinProductDetailService;
 import com.glxp.api.service.system.SystemParamConfigService;
@@ -78,7 +78,7 @@ public class IoCheckInoutService {
     IoSplitFifoCodeService splitFifoCodeService;
 
     @Resource
-    UdiProductDao udiProductDao;
+    UdiProductService udiProductService;
 
     //判断是否需要手动校验
     public boolean checkManual(String billNo) {
@@ -227,6 +227,11 @@ public class IoCheckInoutService {
             orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount());
             orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount());
             orderDetailResultEntity.setId(null);
+            UdiProductEntity product =  udiProductService.findProductByNameCode(orderDetailCodeEntity.getNameCode());
+            if (product.getProductsType() == 2){
+                //药品 拿到药品赋值
+                orderDetailResultEntity.setSpec(product.getBzgg());
+            }
             orderDetailResultService.insert(orderDetailResultEntity);
 
         });
@@ -283,6 +288,11 @@ public class IoCheckInoutService {
                 orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount());
                 orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount());
                 orderDetailResultEntity.setId(null);
+                UdiProductEntity product =  udiProductService.findProductByNameCode(orderDetailCodeEntity.getNameCode());
+                if (product.getProductsType() == 2){
+                    //药品 拿到药品赋值
+                    orderDetailResultEntity.setSpec(product.getBzgg());
+                }
                 orderDetailResultService.insert(orderDetailResultEntity);
 
             });
@@ -556,6 +566,11 @@ public class IoCheckInoutService {
                 orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount());
                 orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount());
                 orderDetailResultEntity.setId(null);
+                UdiProductEntity product =  udiProductService.findProductByNameCode(orderDetailCodeEntity.getNameCode());
+                if (product.getProductsType() == 2){
+                    //药品 拿到药品赋值
+                    orderDetailResultEntity.setSpec(product.getBzgg());
+                }
                 orderDetailResultService.insert(orderDetailResultEntity);
 
             });
@@ -686,6 +701,11 @@ public class IoCheckInoutService {
                 BeanUtils.copyProperties(orderDetailBizEntity, orderDetailResultEntity);
                 orderDetailResultEntity.setId(null);
                 orderDetailResultEntity.setReCount(orderDetailBizEntity.getScanCount());
+                UdiProductEntity product =  udiProductService.findProductByNameCode(orderDetailBizEntity.getNameCode());
+                if (product.getProductsType() == 2){
+                    //药品 拿到药品赋值
+                    orderDetailResultEntity.setSpec(product.getBzgg());
+                }
                 orderDetailResultService.insert(orderDetailResultEntity);
             }
 
@@ -876,7 +896,7 @@ public class IoCheckInoutService {
                 ioOrderCheckResultResponse.setSExpireDate(codeEntity.getExpireDate());
                 ioOrderCheckResultResponse.setCount(0);
                 ioOrderCheckResultResponse.setScanCount(codeEntity.getReCount());
-                UdiProductEntity drug = udiProductDao.findByNameCode(codeEntity.getNameCode());
+                UdiProductEntity drug = udiProductService.findProductByNameCode(codeEntity.getNameCode());
                 if (drug.getProductsType() == 2) {
                     //药品添加药品数据
                     ioOrderCheckResultResponse.setBzgg(drug.getBzgg());
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 45c7cea7d..9e52beb4c 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -30,8 +30,8 @@
 
     <select id="filterBindList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
         select swq.*,bp.nameCode,
-               COALESCE(bp.ggxh,bp.bzgg) AS ggxh,
-               bp.cpmctymc
+        COALESCE(bp.ggxh,bp.bzgg) AS ggxh,
+        bp.cpmctymc
         from sys_workplace_queue swq
         left join
         (select bu.id,bp.nameCode,bp.ggxh,bp.cpmctymc,bp.bzgg
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index be058a6ab..048be3c2e 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -650,6 +650,9 @@
             <if test="inCodeStatus != null">
                 AND io.inCodeStatus = #{inCodeStatus}
             </if>
+            <if test="productType != null and productType != ''">
+                AND io.productType = #{productType}
+            </if>
             <if test="invoiceRegStatus != null  and invoiceRegStatus == 1">
                 AND io_order_invoice.id IS NULL
             </if>
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index 7013bb6e7..9b0058032 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -7,6 +7,7 @@
                 bp.bzgg,
                 bp.prepnUnit,
                 bp.prepnSpec,
+                bp.packUnit as leastPackUnit,
                 io.action
         from io_order_detail_biz
                      left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
@@ -83,7 +84,12 @@
     </select>
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT ic.*, cpmctymc, ggxh
+        SELECT ic.*, bp.cpmctymc,
+        bp.ggxh,
+        bp.bzgg,
+        bp.packUnit,
+        bp.prepnSpec,
+        bp.prepnUnit
         FROM io_order_invoice ic
                      LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
                      LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
index 8a09758b2..dbdadddbc 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
@@ -68,6 +68,7 @@
         LEFT JOIN basic_udirel bu
         ON bu.id = ic.bindRlFk
         LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        left join io_order ioo on ioo.billNo = ic.orderIdFk
         <where>
             <if test="invoiceCode != null and invoiceCode != ''">
                 AND ic.invoiceCode = #{invoiceCode}
@@ -81,6 +82,9 @@
             <if test="invoiceEncode != null and invoiceEncode != ''">
                 AND ic.invoiceEncode = #{invoiceEncode}
             </if>
+            <if test="productType != null and productType != ''">
+                AND ioo.productType = #{productType}
+            </if>
         </where>
         GROUP BY ic.invoiceEncode
         order by ic.updateTime desc
@@ -115,7 +119,8 @@
         io.manufacturer,
         io.certCode,
         io.reCount,
-        io.count
+        io.count,
+        bp.bzgg
         FROM io_order_invoice ic
         INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk
         LEFT JOIN basic_udirel bu