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 4a24ea7..1318c2c 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
@@ -544,11 +544,16 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 
 				//根据任务数循环
 				for (int i = 0; i < configSubSampleMethodDO.getTaskCount(); i++) {
+					Long businessSubSampleId = businessSubSampleDO.getId();
+					Long businessSubSampleAssessmentId = businessSubSampleAssessmentDO.getId();
 					BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> {
 						String assayProject = f.getAssayProject();
 						if (StringUtils.isNotBlank(assayProject)) {
 							List<String> assayProjectList = Arrays.asList(assayProject.split(","));
-							return !assayProjectList.containsAll(dictionaryProjectShowNameList);//分析项目未完全存在，则返回
+							return !assayProjectList.containsAll(dictionaryProjectShowNameList) 
+									&& configAssayMethodId.equals(f.getConfigAssayMethodId())
+									&& businessSubSampleId.equals(f.getBusinessSubSampleId()) 
+									&& businessSubSampleAssessmentId.equals(f.getBusinessSubSampleAssessmentId()) ;//分析项目未完全存在，则返回
 						}
 						return false;
 					}).findFirst().orElse(null);
@@ -776,11 +781,16 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 		for (int i = 0; i < addAssayTaskConfigSubSampleMethodDO.getTaskCount(); i++) {
 			
 			//根据检测方法循环
+			Long businessSubSampleId = businessSubSampleDO.getId();
+			Long businessSubSampleAssessmentId = businessSubSampleAssessmentDO.getId();
 			BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> {
 				String assayProject = f.getAssayProject();
 				if (StringUtils.isNotBlank(assayProject)) {
 					List<String> assayProjectList = Arrays.asList(assayProject.split(","));
-					return !assayProjectList.containsAll(dictionaryProjectShowNameList);//分析项目未完全存在，则返回
+					return !assayProjectList.containsAll(dictionaryProjectShowNameList) 
+							&& addAssayTaskConfigAssayMethod.getId().equals(f.getConfigAssayMethodId())
+							&& businessSubSampleId.equals(f.getBusinessSubSampleId()) 
+							&& businessSubSampleAssessmentId.equals(f.getBusinessSubSampleAssessmentId()) ;//分析项目未完全存在，则返回
 				}
 				return false;
 			}).findFirst().orElse(null);