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 1d2209be..a3a0d0a2 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
@@ -351,8 +351,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
         queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
         queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType()),"cgd_type",cgdMainEntityDto.getCgdType());
+//        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(","));
+            }else if (cgdMainEntityDto.getCgdType().indexOf(",")==-1){
+                queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType());
+            }
+        }
         Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
         List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
         IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
index 5504ee2b..a4b5893b 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
@@ -300,12 +300,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         text = SqlInjectionUtil.getSqlInjectField(text);
         code = SqlInjectionUtil.getSqlInjectField(code);
         List<DictModel> dictModels = Lists.newArrayList();
-        int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
-        if(existIzEnabled>0){
-            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
-        }else{
-            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
-        }
+//        int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
+//        if(existIzEnabled>0){
+//            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
+//        }else{
+//            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
+//        }
+        dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
         return dictModels;
     }