判定结果上报

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

@@ -32,6 +32,9 @@ public interface QmsCommonConstant {
     /** 正常 **/
     String NORMAL = "normal";
     
+    /** 超差 **/
+    String EXCEEDS_TOLERANCE = "exceeds_tolerance";
+    
     /** 隔离 **/
     String ISOLATION = "isolation";
     
@@ -74,6 +77,15 @@ public interface QmsCommonConstant {
     /** 已完成 **/
     String COMPLETED = "completed";
     
+    /** 固定字段 **/
+    String FIELD_FIXED = "field_fixed";
+    
+    /** 动态字段 **/
+    String FIELD_DYNAMIC = "field_dynamic";
+    
+    /** 计算字段 **/
+    String FIELD_CALCULATED = "field_calculated";
+    
     /** 委托登记 **/
     String ENTRUST_REGISTRATION = "entrust_registration";
     

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

@@ -1,10 +1,12 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,4 +35,45 @@ public class SampleAnalysisAuditController {
 		sampleAnalysisAuditService.crossAuditByByTaskId(businessAssayTaskId, auditStatus);
 		return success("成功");
 	}
+	
+	@GetMapping("/getSampleResultAssessmentList")
+	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId) {
+		
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId);
+		
+		return success(result);
+	}
+	
+	@GetMapping("/getResultAssessment")
+	public CommonResult<?> getResultAssessment(String assayType, Long sampleId, Long configAssayMethodId) {
+		JSONObject result = null;
+		if ("平行".equals(assayType)) {
+			result = sampleAnalysisAuditService.getParallelResultAssessment(sampleId, configAssayMethodId);
+		} else if ("双杯".equals(assayType)) {
+			result = sampleAnalysisAuditService.getDoubleCupResultAssessment(sampleId, configAssayMethodId);
+		}
+		return success(result);
+	}
+	
+	//平行分析结果判定
+	@GetMapping("/getParallelResultAssessment")
+	public CommonResult<?> getParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId) {
+		JSONObject result = sampleAnalysisAuditService.getParallelResultAssessment(businessSubSampleId, configAssayMethodId);
+		return success(result);
+	}
+	
+	//双杯分析结果判定
+	@GetMapping("/getDoubleCupResultAssessment")
+	public CommonResult<?> getDoubleCupResultAssessment(Long businessSubParentSampleId, Long configAssayMethodId) {
+		JSONObject result = sampleAnalysisAuditService.getDoubleCupResultAssessment(businessSubParentSampleId, configAssayMethodId);
+		return success(result);
+	}
+	
+	//判定数据上报
+	@PostMapping("/assessmentDataReporting")
+	public CommonResult<?> assessmentDataReporting(Long businessSubSampleId, Long configAssayMethodId) {
+		sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, configAssayMethodId);
+		return success("成功"); 
+	}
+	
 }

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

@@ -62,4 +62,7 @@ public class BatchSampleAnalysisColumnRespVO implements Serializable {
     
     @Schema(description = "单位")
     private String unit;
+    
+    @Schema(description = "填写方式")
+    private String fillingWay;
 }

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

@@ -57,5 +57,7 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
     /** 类型（1：元素，2：参数） **/
     @Schema(description = "类型（project：元素，2：参数）")
     private String type;
-
+    
+    @Schema(description = "填写方式")
+    private String fillingWay;
 }

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

@@ -0,0 +1,35 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDataRespVO {
+
+    @Schema(description = "样品名称", example = "张三")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
+
+    @Schema(description = "分析人员")
+    private String assayOperator;
+    
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+
+    @Schema(description = "单位")
+    private String dictionaryProjectUnit;
+}

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

@@ -13,6 +13,12 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayProjectDataReqVO {
 
+    @Schema(description = "分样子样ID", example = "20464")
+    private Long businessSubSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "9130")
+    private Long configAssayMethodId;
+    
     @Schema(description = "检测任务ID", example = "16505")
     private Long businessAssayTaskDataId;
 

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

@@ -1,10 +1,18 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataRespVO {
+	
+    @Schema(description = "收样人")
+    private String sampleReceiver;
+
+    @Schema(description = "收样时间")
+    private LocalDateTime sampleReceiveTime;
 
 	/** 分析方法名称 **/
     @Schema(description = "分析方法名称")

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

@@ -0,0 +1,17 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubSampleAssessmentExtendRespVO extends BusinessSubSampleAssessmentRespVO {
+
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+}

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

@@ -0,0 +1,31 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ReportFieldValueData implements Serializable {
+
+	private static final long serialVersionUID = 4301653225442965919L;
+
+	@Schema(description = "字段名称")
+    private String fieldName;
+	
+    @Schema(description = "值")
+    private String fieldValue;
+
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "单位")
+    private String unit;
+    
+    @Schema(description = "符号")
+    private String mathSymbol;
+	
+}

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

@@ -0,0 +1,37 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 样品分析结果判定
+ */
+@Data
+public class SampleAssayResultAssessmentRespVO implements Serializable {
+
+	private static final long serialVersionUID = 5216179630941802338L;
+
+	@Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+	
+    @Schema(description = "收样人")
+    private String sampleReceiver;
+
+    @Schema(description = "收样时间")
+    private LocalDateTime sampleReceiveTime;
+    
+    @Schema(description = "分析人")
+    private String assayOperator;
+
+    @Schema(description = "上报时间")
+    private LocalDateTime reportTime;
+}