diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
index 9862678b..ad6fd296 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
@@ -575,6 +575,9 @@ public class InvoicingApi {
         queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"a.nu_id", materialInfoEntity.getNuId());
         queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getWlId()),"a.wl_id", materialInfoEntity.getWlId());
         queryWrapper.apply(StringUtils.isNotBlank(materialInfoEntity.getWlParamInfo()),"( b.material_name like '%"+materialInfoEntity.getWlParamInfo()+"%' or b.material_no like '%"+materialInfoEntity.getWlParamInfo()+"%' or b.pinyin like '%"+materialInfoEntity.getWlParamInfo()+"%' or b.specification_model like '%"+materialInfoEntity.getWlParamInfo()+"%' ) ");
+
+        queryWrapper.like(StringUtils.isNotBlank(materialInfoEntity.getDdNo()),"a.dd_no", materialInfoEntity.getDdNo());
+        queryWrapper.like(StringUtils.isNotBlank(materialInfoEntity.getManufacturer()),"c.manufacturer", materialInfoEntity.getManufacturer());
         Page<MaterialInfoEntity> page = new Page<MaterialInfoEntity>(pageNo, pageSize);
         IPage<MaterialInfoEntity> pageList = invoicingApi.getCkWlList(page, queryWrapper);
         return Result.OK(pageList);
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
index f989be7b..168e1521 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
@@ -131,4 +131,6 @@ public class CgdMainEntity implements Serializable {
      */
     private String izOrgConfirmed;
     private String izGuazhang;;
+    private String ids;;
+
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java
index cb281668..1b501e8d 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java
@@ -28,4 +28,5 @@ public interface NuInvoicingCgdMainMapper extends BaseMapper<NuInvoicingCgdMain>
     List<NuInvoicingCgdMain> selecCgdWlsfzytList(@Param("wlId") String wlId);
 
 
+    List<NuInvoicingCgdMain> getCgdListNum(@Param("params") CgdMainEntity cgdMainEntityDto);
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml
index 404c85cd..f555286b 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml
@@ -25,4 +25,22 @@
         inner join nu_invoicing_cgd_info b on a.id = b.cgd_id
         where a.cgd_type = '0' and a.status in (0,1) and b.wl_id = #{wlId}
     </select>
+
+
+    <select id="getCgdListNum" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdMain">
+        SELECT main.*
+        FROM nu_invoicing_cgd_info info
+            INNER JOIN nu_invoicing_cgd_main main ON info.cgd_id = main.id
+        <where>
+            <if test="params.gysId != null and params.gysId != ''">
+                and FIND_IN_SET(main.gys_id, #{params.gysId}) > 0
+            </if>
+            <if test="params.typeId != null and params.typeId != ''">
+                and FIND_IN_SET(info.type_id, #{params.typeId}) > 0
+            </if>
+            <if test="params.status != null and params.status != ''">
+                and main.status = #{params.status}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
index ea336910..8c5212c7 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
@@ -449,7 +449,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
         queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
         queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
-//        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
+        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getIds()),"id",cgdMainEntityDto.getIds().split(","));
+        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
         if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
             if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
                 queryWrapper.in("cgd_type",cgdMainEntityDto.getCgdType().split(","));
@@ -799,7 +800,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         QueryWrapper<ConfigSuppliersInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(materialInfoEntityDto.getGysName()),"suppliers_name",materialInfoEntityDto.getGysName());
         queryWrapper.eq("del_flag","0");
-        queryWrapper.eq("iz_enabled","Y");
+//        queryWrapper.eq("iz_enabled","Y");
         List<ConfigSuppliersInfo> gysList = gysMapper.selectList(queryWrapper);
         List<Map<String, Object>> list = new ArrayList<>();
         for(ConfigSuppliersInfo gys : gysList){
@@ -815,20 +816,29 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Override
     public Map<String, Object> getCgdListNum(CgdMainEntity cgdMainEntityDto) {
         Map<String, Object> map = new HashMap<>();
-        QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>() ;
-        queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')");
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"gys_id",cgdMainEntityDto.getSuppliers());
-        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"gg_by",cgdMainEntityDto.getCgBy());
-        queryWrapper.ge(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
-        if(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime())){
-            cgdMainEntityDto.setEndTime(cgdMainEntityDto.getEndTime()+" 23:59:59");
-            queryWrapper.le("qg_date",cgdMainEntityDto.getEndTime());
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
-        List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(queryWrapper);
+//        QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>() ;
+//        queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')");
+//        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"gys_id",cgdMainEntityDto.getSuppliers());
+//        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"gg_by",cgdMainEntityDto.getCgBy());
+//        queryWrapper.ge(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
+//        if(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime())){
+//            cgdMainEntityDto.setEndTime(cgdMainEntityDto.getEndTime()+" 23:59:59");
+//            queryWrapper.le("qg_date",cgdMainEntityDto.getEndTime());
+//        }
+//        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
+        List<NuInvoicingCgdMain> list = cgdMainMapper.getCgdListNum(cgdMainEntityDto);
         map.put("success",true);
         map.put("message","采购单数量");
         map.put("totalSize",list.size());
+        String ids = "";
+        for (NuInvoicingCgdMain cgdMain : list){
+            ids += cgdMain.getId()+",";
+        }
+        if(ids.length()>0){
+            map.put("ids",ids.substring(0,ids.length()-1));
+        }else{
+            map.put("ids","-1");
+        }
         return map;
     }
 
@@ -1582,6 +1592,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             qgdInfo.setBrandType(configMaterialInfo.getBrandType());
             qgdInfo.setManufacturer(configMaterialInfo.getManufacturer());
             qgdInfo.setMaterialImg(configMaterialInfo.getMaterialImg());
+            qgdInfo.setCategoryId(configMaterialInfo.getCategoryId());
+            qgdInfo.setTypeId(configMaterialInfo.getTypeId());
+            qgdInfo.setMedicationId(configMaterialInfo.getMedicationId());
             tempMap.get(suppliersId).add(qgdInfo);
         }
         //判断是否错误
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml
index cd4d4450..b81d73d7 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml
@@ -55,9 +55,10 @@
         SELECT
             count(DISTINCT ck_id) as num
         FROM
-            nu_invoicing_pdd_info
+            nu_invoicing_pdd_info a
+                INNER JOIN nu_warehouse_material_info b on a.ck_id = b.id
         WHERE
-            create_time LIKE concat( DATE_FORMAT( now(), '%Y-%m-%d' ), '%' )
-          and nu_id = #{params.nuId}
+            a.create_time LIKE concat( DATE_FORMAT( now(), '%Y-%m-%d' ), '%' ) and b.kcsl > 0
+          and a.nu_id = #{params.nuId}
     </select>
 </mapper>
\ No newline at end of file