ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java

@@ -156,10 +156,20 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         List<ProductFeaturesDTO> inspectionSheetFeaturesList = getInspectionSheetFeaturesList(params);
         if (inspectionSheetFeaturesList != null && inspectionSheetFeaturesList.size() != 0) {
             //分组样本数=样本大小=检验特性分组数的最大值
-            Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
-            if (numbersOfSamples != null) {
-                dto.setNumberOfGroupedSamples(numbersOfSamples);
-                dto.setNumberOfSamples(numbersOfSamples);
+            //Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
+            //过滤计量型特性
+            List<ProductFeaturesDTO> featuresList = inspectionSheetFeaturesList.stream().filter(s->s.getType()==1).collect(Collectors.toList());
+            if(featuresList != null && featuresList.size() != 0) {
+                Integer numbersOfSamples = featuresList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
+                if (numbersOfSamples != null) {
+                    dto.setNumberOfGroupedSamples(numbersOfSamples);
+                    dto.setNumberOfSamples(numbersOfSamples);
+                }
+            }
+            //若只有计数型特性，样本大小默认为1
+            else{
+                dto.setNumberOfGroupedSamples(1);
+                dto.setNumberOfSamples(1);
             }
         }
         /*