add

输注列表新增输注标识

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicStatsReturnResult.java

@@ -90,6 +90,10 @@ public class ClinicStatsReturnResult implements Serializable {
         List<BigDecimal> axisPositions = new ArrayList<>();
 
         for (ClinicStatsQueryResult queryResult : queryResults) {
+            //最后一次有效次数
+            int lastValidCount=0;
+            //最后一次无效次数
+            int lastInValidCount=0;
             if(queryResult.getUploadTime()==null){
                 continue;
             }
@@ -126,8 +130,26 @@ public class ClinicStatsReturnResult implements Serializable {
             appendDoses.add(appendDose);
             inputDoses.add( queryResult.getInputDose()!=null?queryResult.getInputDose():BigDecimal.ZERO);
             electricQuantities.add(queryResult.getElectricQuantity());
-            validCounts.add(queryResult.getValidCount()!=null?queryResult.getValidCount():0);
-            inValidCounts.add(queryResult.getInValidCount()!=null?queryResult.getInValidCount():0);
+            if (ObjectUtil.isNotNull(queryResult.getValidCount())) {
+                if(ObjectUtil.equals(queryResult.getValidCount(),lastValidCount)){
+                    validCounts.add(0);
+                }else {
+                    lastValidCount=queryResult.getValidCount();
+                    validCounts.add(1);
+                }
+            }else {
+                validCounts.add(0);
+            }
+            if (ObjectUtil.isNotNull(queryResult.getInValidCount())) {
+                if(ObjectUtil.equals(queryResult.getInValidCount(),lastInValidCount)){
+                    validCounts.add(0);
+                }else {
+                    lastInValidCount=queryResult.getInValidCount();
+                    validCounts.add(1);
+                }
+            }else {
+                inValidCounts.add(0);
+            }
 
             snrCounts.add(queryResult.getSnr()!=null?queryResult.getSnr():0);
             rssiCounts.add(queryResult.getRssi()!=null?queryResult.getRssi():0);