add 自控次数

nb-system/src/main/java/com/nb/bus/entity/common/DeviceProperties.java

@@ -13,6 +13,7 @@ import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
+import java.util.Optional;
 
 /**
  * @author lifang
@@ -146,4 +147,19 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
 
     @ApiModelProperty(value = "公共参数-电量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     private Integer electricQuantity;
+
+
+    public Integer getPcaTotalCount() {
+        return getPcaInvalidCount()+getPcaValidCount();
+    }
+
+
+    public Integer getPcaValidCount() {
+        return Optional.ofNullable(pcaValidCount).orElse(0);
+    }
+
+
+    public Integer getPcaInvalidCount() {
+        return Optional.ofNullable(pcaInvalidCount).orElse(0);
+    }
 }

nb-system/src/main/java/com/nb/bus/service/dto/CombineHistoryResult.java

@@ -48,20 +48,4 @@ public class CombineHistoryResult extends CombineResult {
 
     @ApiModelProperty(value = "公共-此次输注过程中到此为止的总追加量")
     private BigDecimal totalAppendDose;
-
-
-    @Override
-    public Integer getPcaTotalCount() {
-        return getPcaInvalidCount()+getPcaValidCount();
-    }
-
-    @Override
-    public Integer getPcaValidCount() {
-        return Optional.ofNullable(pcaValidCount).orElse(0);
-    }
-
-    @Override
-    public Integer getPcaInvalidCount() {
-        return Optional.ofNullable(pcaInvalidCount).orElse(0);
-    }
 }