结果判定

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

@@ -37,9 +37,9 @@ public class SampleAnalysisAuditController {
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId) {
+	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus) {
 		
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId);
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, assessmentStatus);
 		
 		return success(result);
 	}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentDO.java

@@ -75,7 +75,7 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
     /**
     * 判定值
     */
-    @TableField("ASMT_VAL")
+    @TableField(value = "ASMT_VAL", updateStrategy = FieldStrategy.ALWAYS)
     private String assessmentValue;
     /**
     * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.java

@@ -53,9 +53,15 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
     			.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentExtendRespVO::getDictionaryProjectKey)
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentExtendRespVO::getShowName)
+				.eq(BusinessSubSampleAssessmentDO::getBusinessSubSampleId, businessSubSampleId)
+				.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    }
+    
+    default BusinessSubSampleAssessmentDO selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(Long businessSubSampleId, Long configAssayMethodId, Long configAssayMethodProjectId) {
+    	return selectOne(new LambdaQueryWrapperX<BusinessSubSampleAssessmentDO>()
     			.eq(BusinessSubSampleAssessmentDO::getBusinessSubSampleId, businessSubSampleId)
     			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId)
-    			);
+    			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodProjectId, configAssayMethodProjectId));
     }
 
 }

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

@@ -18,7 +18,7 @@ public interface SampleAnalysisAuditService {
 
 	void crossAuditByByTaskId(Long businessAssayTaskId, String auditStatus);
 
-	JSONObject getSampleResultAssessmentList(Long configAssayMethodId);
+	JSONObject getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus);
 
 	JSONObject getParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId);