结果报送，复检修改

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

@@ -122,7 +122,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
 	
-	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RETEST_NOT_EXISTS  = new ErrorCode(1_032_100_000, "分样复测业务数据不存在");
 
 	ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在");
 	ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");

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

@@ -45,6 +45,9 @@ public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDa
     @Schema(description = "单位")
     private String dictionaryProjectUnit;
 
-    @Schema(description = "分析次数")
-    private Integer analysisCount;
+    @Schema(description = "复检次数")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数")
+    private Integer retestCount;
 }

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

@@ -11,6 +11,8 @@ public class BusinessAssayTaskDataGroupRespVO {
 	/** 方法名称 **/
 	private String configAssayMethodName;
 	
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	/** 方法名称及类别 **/
 	private String configAssayMethodNameAndCategory;
 

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

@@ -82,8 +82,11 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", example = "13073")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;

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

@@ -1,9 +1,7 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.zt.plat.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
@@ -82,8 +80,11 @@ public class BusinessAssayTaskDataReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", example = "13073")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;

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

@@ -103,9 +103,13 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("样品流程节点时间")
     private LocalDateTime sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
-    @ExcelProperty("分析次数,复检的累加次数")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    @ExcelProperty("复测次数")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     @ExcelProperty("乐观锁")

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

@@ -90,9 +90,11 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotNull(message = "样品流程节点时间不能为空")
     private LocalDateTime sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
-    @NotNull(message = "分析次数,复检的累加次数不能为空")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
 
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     private Integer updateCount;

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

@@ -9,6 +9,9 @@ public class BusinessSubParentSampleAssessmentGroupRespVO {
 	@Schema(description = "分析方法id")
 	private Long configAssayMethodId;
 	
+	@Schema(description = "方法大类")
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     

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

@@ -28,6 +28,9 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
 
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
+
     @Schema(description = "是否已上报")
     private Integer isReported;