diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
index d30b381..dd54133 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
@@ -432,6 +432,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 				//查询子样对应的分析方法
 				ConfigSubSampleMethodExtendRespVO configSubSampleMethodDO = configSubSampleMethodList.stream().filter(f -> f.getIsDefaultUse().equals(QmsCommonConstant.YES) && f.getConfigAssayMethodId().equals(configAssayMethodId) && f.getConfigSubSampleId().equals(configSubSample.getId())).findFirst().orElse(null);
 				
+				if (configSubSampleMethodDO == null) {
+					throw new ServiceException(1_032_100_000, "未找到子样对应的分析方法配置！");
+				}
+				
 				//扩展配置信息
 				String configInfomation = configSubSampleMethodDO.getConfigInfomation();
 				if (StringUtils.isNotBlank(configInfomation)) {
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 e1d55c5..1956a89 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
@@ -25,6 +25,7 @@
         WHERE
             tbatd.DELETED = 0
             AND tcam.DELETED = 0
+            AND tbssag.DELETED = 0
             AND tbatd.IS_ASN_TSKD = 0
             AND tbatd.IS_RPOD = 0
             AND tbssag.SMP_STS = '已收样'
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
index ba2109f..1f0fffe 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
@@ -103,6 +103,7 @@
                 T_BSN_SB_PRN_SMP_ASMT tbspsa
             WHERE
                 tbspsa.IS_RPOD = 0
+                AND tbspsa.DELETED = 0
                 AND tbspsa.CFG_ASY_MTHD_ID = #{reqVO.configAssayMethodId}
             GROUP BY
                 tbspsa.BSN_SB_PRN_SMP_ID ,