结果判定调整

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -127,4 +127,13 @@ public interface QmsCommonConstant {
     
     /** 结束 **/
     String FLOW_NODE_END = "flw_end";
+    
+    /** 单杯 **/
+    String ASSAY_TYPE_SINGLE_CUP = "single_cup";
+    
+    /** 双杯 **/
+    String ASSAY_TYPE_DOUBLE_CUP = "double_cup";
+    
+    /** 平行 **/
+    String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel";
 }

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

@@ -11,6 +11,8 @@ import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
+
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 
@@ -52,9 +54,9 @@ public class SampleAnalysisAuditController {
 	@GetMapping("/getResultAssessment")
 	public CommonResult<?> getResultAssessment(String assayType, Long sampleId, Long configAssayMethodId) {
 		JSONObject result = null;
-		if ("平行".equals(assayType)) {
+		if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(assayType)) {//平行
 			result = sampleAnalysisAuditService.getParallelResultAssessment(sampleId, configAssayMethodId);
-		} else if ("双杯".equals(assayType)) {
+		} else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(assayType)) {//双杯
 			result = sampleAnalysisAuditService.getDoubleCupResultAssessment(sampleId, configAssayMethodId);
 		}
 		return success(result);
@@ -78,9 +80,9 @@ public class SampleAnalysisAuditController {
 	@PostMapping("/modifyResultAssessment")
 	public CommonResult<?> modifyResultAssessment(@RequestBody ModifyResultAssessmentReqVO reqVO) {
 		JSONObject result = null;
-		if ("平行".equals(reqVO.getAssayType())) {
+		if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(reqVO.getAssayType())) {//平行
 			result = sampleAnalysisAuditService.modifyParallelResultAssessment(reqVO.getSampleId(), reqVO.getConfigAssayMethodId(), reqVO.getSampleAssessmentId(), reqVO.getBusinessAssayProjectDataIds());
-		} else if ("双杯".equals(reqVO.getAssayType())) {
+		} else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(reqVO.getAssayType())) {//双杯
 			
 		}
 		return success(result);
@@ -93,6 +95,14 @@ public class SampleAnalysisAuditController {
 		return success("成功"); 
 	}
 	
+	@PostMapping("/batchAssessmentDataReporting")
+	public CommonResult<?> batchAssessmentDataReporting(@RequestBody BatchAssessmentDataReportingReqVO reqVO) {
+		for (Long businessSubSampleId : reqVO.getBusinessSubSampleIds()) {
+			sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, reqVO.getConfigAssayMethodId());
+		}
+		return success("成功"); 
+	}
+	
 	//重新创建复检委托
 	@PostMapping("/createReAnalysis")
 	public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId) {

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BatchAssessmentDataReportingReqVO.java

@@ -0,0 +1,13 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class BatchAssessmentDataReportingReqVO {
+
+	private List<Long> businessSubSampleIds;
+	
+	private Long configAssayMethodId;
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java

@@ -31,7 +31,7 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "2")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
     private String assayType;
 
     @Schema(description = "检测项目")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java

@@ -31,7 +31,7 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "2")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
     private String assayType;
 
     @Schema(description = "检测项目")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java

@@ -40,8 +40,8 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...")
+    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
     private String assayType;
 
     @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java

@@ -38,8 +38,8 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...不能为空")
+    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
     private String assayType;
 
     @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java

@@ -28,7 +28,7 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
     private String assayType;
 
     @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentRespVO.java

@@ -36,8 +36,8 @@ public class BusinessSubSampleAssessmentRespVO {
     @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...")
+    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
     private String assayType;
 
     @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java

@@ -34,8 +34,8 @@ public class BusinessSubSampleAssessmentSaveReqVO {
     @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...不能为空")
+    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
     private String assayType;
 
     @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")