质控空白样

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java

@@ -56,14 +56,6 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
 		return success(list);
 	} 
 	
-	/**
-	@GetMapping("/getAssayMethodList")
-	public CommonResult<?> getAssayMethodList(Long businessSubSampleId, Long configAssayMethodId) {
-		List<Object> list = sampleTaskAssignService.getAssayMethodList(businessSubSampleId, configAssayMethodId);
-		return success(list);
-	}
-	**/
-
 	@GetMapping("/getAssayMethodProjectList")
 	public CommonResult<?> getAssayMethodProjectList(String businessSubSampleIds, Long configAssayMethodId) {
 		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignDataSaveOrUpdateCmp.java

@@ -11,11 +11,17 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataD
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleTaskAssignContext;
 import jakarta.annotation.Resource;
 
@@ -37,6 +43,15 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent {
 	@Resource
 	private BusinessQCCoefficientParameterDataMapper  businessQCCoefficientParameterDataMapper;
 	
+	@Resource
+	private BusinessQCManagementDataMapper businessQCManagementDataMapper;
+	
+	@Resource
+	private BusinessQCManagementProjectDataMapper businessQCManagementProjectDataMapper;
+	
+	@Resource
+	private BusinessQCManagementParameterDataMapper businessQCManagementParameterDataMapper;
+
 	@Override
 	public void process() throws Exception {
 		SampleTaskAssignContext sampleTaskAssignContext = this.getContextBean(SampleTaskAssignContext.class);
@@ -53,6 +68,12 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent {
 		
 		List<BusinessQCCoefficientParameterDataDO> businessQCCoefficientParameterDataList = sampleTaskAssignContext.getBusinessQCCoefficientParameterDataList();
 		
+		List<BusinessQCManagementDataDO> businessQCManagementDataDOList = sampleTaskAssignContext.getBusinessQCManagementDataDOList();
+		
+		List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataDOList = sampleTaskAssignContext.getBusinessQCManagementProjectDataDOList();
+		
+		List<BusinessQCManagementParameterDataDO> businessQCManagementParameterDataDOList = sampleTaskAssignContext.getBusinessQCManagementParameterDataDOList();
+		
 		if (CollUtil.isNotEmpty(savebusinessAssayTaskList)) {
 			this.businessAssayTaskMapper.insertBatch(savebusinessAssayTaskList);
 		}
@@ -76,6 +97,18 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent {
 		if (CollUtil.isNotEmpty(businessQCCoefficientParameterDataList)) {
 			this.businessQCCoefficientParameterDataMapper.insertBatch(businessQCCoefficientParameterDataList);
 		}
+		
+		if (CollUtil.isNotEmpty(businessQCManagementDataDOList)) {
+			this.businessQCManagementDataMapper.insertBatch(businessQCManagementDataDOList);
+		}
+		
+		if (CollUtil.isNotEmpty(businessQCManagementProjectDataDOList)) {
+			this.businessQCManagementProjectDataMapper.insertBatch(businessQCManagementProjectDataDOList);
+		}
+		
+		if (CollUtil.isNotEmpty(businessQCManagementParameterDataDOList)) {
+			this.businessQCManagementParameterDataMapper.insertBatch(businessQCManagementParameterDataDOList);
+		}
 	}
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/slot/SampleTaskAssignContext.java

@@ -10,6 +10,9 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataD
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.bus.liteflow.param.AssignAssayUser;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
@@ -90,4 +93,13 @@ public class SampleTaskAssignContext {
     /** 质控样-(空白、标准)检测参数数据 **/
     private List<BusinessQCCoefficientParameterDataDO> businessQCCoefficientParameterDataList;
     
+    /** 质控样-（质控空白） **/
+    private List<BusinessQCManagementDataDO> businessQCManagementDataDOList;
+    
+    /** 质控样-（质控空白）检测项目 **/
+    private List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataDOList;
+
+    /** 质控样-（质控空白）检测项目参数 **/
+    private List<BusinessQCManagementParameterDataDO> businessQCManagementParameterDataDOList;
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java

@@ -947,7 +947,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 						businessAssayParameterDataMapper.updateBatch(businessAssayParameterDataList);
 					}
 					
-				} else if ("zky".equals(businessAssayTaskAnalysisDataRespVO.getAnalysisType())) {
+				} else if ("zky".equals(businessAssayTaskAnalysisDataRespVO.getAnalysisType()) || "zkkby".equals(businessAssayTaskAnalysisDataRespVO.getAnalysisType())) {
 					List<BusinessQCManagementDataDO> BusinessQCManagementDataList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
 			        
 			        List<Long> businessQCManagementDataIdList = BusinessQCManagementDataList.stream().map(m -> m.getId()).collect(Collectors.toList());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java

@@ -31,14 +31,6 @@ public interface SampleTaskAssignService {
 	 */
 	List<UnAssignTaskedSubSampleRespVO> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO);
 	
-	/**
-	 * 根据子样id查询分析方法
-	 * @param businessSubSampleId
-	 * @param configAssayMethodId
-	 * @return
-	 */
-//	List<Object> getAssayMethodList(Long businessSubSampleId, Long configAssayMethodId);
-
 	/**
 	 * 根据子样id列表，查询分析方法项目
 	 * @param businessSubSampleIdList 子样id列表