diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java
index bb028ae..f9db69b 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java
@@ -40,8 +40,8 @@ public class SampleTaskAssignController {
 	}
 	
 	@GetMapping("/getAssaySampleList")
-	public CommonResult<?> getAssaySampleList() {
-		List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList();
+	public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
+		List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(reqVO);
 		return success(list);
 	} 
 	
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
index 65d3703..c7a5c21 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
@@ -107,4 +107,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "部门id")
+    private Long deptId;
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
index 3aa916b..929a1b0 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
@@ -329,7 +329,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 	 * 查询未指派的子样
 	 * @return
 	 */
-	List<UnAssignTaskedSubSampleRespVO> selectUnAssignTaskedSubSample();
+	List<UnAssignTaskedSubSampleRespVO> selectUnAssignTaskedSubSample(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO);
 
 
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
index 8ceec27..1c24727 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
@@ -60,6 +60,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
                 .orderByDesc(BusinessAssayTaskDO::getId));
     }
 
@@ -99,6 +100,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
                 .orderByDesc(BusinessAssayTaskDO::getId));
 	}
     
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java
index b287b5e..8afa8f5 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java
@@ -22,7 +22,7 @@ public interface SampleTaskAssignService {
 	 * 获取未指派任务子样信息
 	 * @return
 	 */
-	List<UnAssignTaskedSubSampleRespVO> getAssaySampleList();
+	List<UnAssignTaskedSubSampleRespVO> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO);
 	
 	/**
 	 * 根据子样id查询分析方法
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java
index fc4c815..e70cb1d 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java
@@ -177,8 +177,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
 	}
 
 	@Override
-	public List<UnAssignTaskedSubSampleRespVO> getAssaySampleList() {
-		List<UnAssignTaskedSubSampleRespVO> list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample();
+	public List<UnAssignTaskedSubSampleRespVO> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
+		List<UnAssignTaskedSubSampleRespVO> list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample(reqVO);
 		return list;
 	}
 
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
index 56dd93a..bd0a3cf 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
@@ -74,7 +74,18 @@
             T_BSN_ASY_TSK_DAT tbatd
         LEFT JOIN T_BSN_SB_SMP tbss ON
             tbatd.BSN_SB_SMP_ID = tbss.ID
-        WHERE tbatd.IS_ASN_TSKD = 0
+        WHERE 
+            tbatd.DELETED = 0
+            AND tbatd.IS_ASN_TSKD = 0
+      <if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
+            AND tbatd.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
+      </if>
+      <if test="reqVO.sampleFlowNodeKey != null and reqVO.sampleFlowNodeKey != ''">
+            AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey}
+      </if>
+      <if test="reqVO.sampleFlowNodeTime[0] != null and reqVO.sampleFlowNodeTime[0] != null">
+            AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]}
+      </if>
         AND tbatd.SMP_FLW_NDE_KY = 'flw_analysis'
         GROUP BY tbss.ID ,
             tbss.SMP_NAME ,