fix

nb-system/src/main/java/com/nb/bus/entity/BusDeviceRunningEntity.java

@@ -170,7 +170,9 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
         this.setFirstDose( items.getInteger(PumpParams.firstDosis));
         this.setMaxDose(items.getBigDecimal(PumpParams.maxDose));
         this.setAppendDose(items.getBigDecimal(PumpParams.singleDosis));
-        this.setAppendLockTime(items.getBigDecimal(PumpParams.lockTime));
+
+        this.setSelfControlLockTime(items.getBigDecimal(PumpParams.lockTime));
+
         this.setContinueDose(items.getBigDecimal(PumpParams.flow));
         this.setType( DeviceTypeUtils.getDeviceType(items.getInteger(PumpParams.pumpType)));
         this.setPcaValidCount(items.getInteger(PumpParams.pcaValid));

nb-system/src/main/java/com/nb/bus/entity/BusInfusionHistoryEntity.java

@@ -137,7 +137,8 @@ public class BusInfusionHistoryEntity extends CommonDeviceParam<String,String> {
         this.setInputDose(items.getBigDecimal(PumpParams.finishedDose));
         this.setFirstDose( items.getInteger(PumpParams.firstDosis));
         this.setMaxDose(items.getBigDecimal(PumpParams.maxDose));
-        this.setAppendLockTime(items.getBigDecimal(PumpParams.lockTime));
+//        this.setAppendLockTime(items.getBigDecimal(PumpParams.lockTime));
+        this.setSelfControlLockTime(items.getBigDecimal(PumpParams.lockTime));
         this.setContinueDose(items.getBigDecimal(PumpParams.flow));
         this.setType( DeviceTypeUtils.getDeviceType(items.getInteger(PumpParams.pumpType)));
         this.setAppendDose(items.getBigDecimal(PumpParams.singleDosis));

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

@@ -70,18 +70,20 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
     @DecimalMin(value = "0",message ="PCA追加量最小值不得低于0" )
     private BigDecimal appendDose;
 
-    @ApiModelProperty(value = "公共参数-追加锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
-    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-    @DecimalMin(value = "1",message ="PCA追加量最小值不得低于0" )
-    private BigDecimal appendLockTime;
+//    @ApiModelProperty(value = "公共参数-追加锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+//    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
+//    @DecimalMin(value = "1",message ="PCA追加量最小值不得低于0" )
+//    private BigDecimal appendLockTime;
 
     @ApiModelProperty(value = "公共参数-极限量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
     @DecimalMin(value = "0",message ="PCA追加量最小值不得低于0" )
     private BigDecimal maxDose;
 
-    @ApiModelProperty(value = "公共参数-自控锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
-    private Integer selfControlLockTime;
+    @ApiModelProperty(value = "公共参数-自控锁时 即单次追加锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
+    @DecimalMin(value = "1",message ="PCA追加量最小值不得低于0" )
+    private BigDecimal selfControlLockTime;
 
     @ApiModelProperty(value = "公共参数-自控次数",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     private Integer selfControlCount;

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

@@ -1,5 +1,6 @@
 package com.nb.bus.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nb.bus.enums.DeviceAlarmEnum;
 import com.nb.bus.enums.DeviceStatusEnum;
 import com.nb.common.enums.SexEnum;
@@ -68,5 +69,8 @@ public class PatientDeviceRepeatResult  implements Serializable {
         private Date infusionStartTime;
         @ApiModelProperty("是否为主泵")
         private Boolean master;
+
+
+
     }
 }

nb-system/src/main/java/com/nb/bus/utils/MockUtils.java

@@ -1,56 +0,0 @@
-package com.nb.bus.utils;
-
-import cn.hutool.core.util.RandomUtil;
-import com.nb.bus.entity.BusDeviceRunningEntity;
-import com.nb.bus.enums.DeviceTypeEnum;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName MockUtils.java
- * @Description TODO
- * @createTime 2022年05月05日 14:29:00
- */
-public class MockUtils {
-    public static BusDeviceRunningEntity mock(String deviceId,String patientCode,String classify,DeviceTypeEnum type){
-        BusDeviceRunningEntity pump = new BusDeviceRunningEntity();
-        pump.setType(type);
-        pump.setClassification(classify);
-        pump.setDeviceId(deviceId);
-        pump.setPatientCode(patientCode);
-        pump.setTotalDose(RandomUtil.randomInt(100));
-        pump.setFirstDose(RandomUtil.randomInt(100));
-        pump.setRemainDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setInputDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setAppendDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setAppendLockTime(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setMaxDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-//        pump.setSelfControlCount(RandomUtil.randomInt(100));
-        pump.setSelfControlLockTime(RandomUtil.randomInt(100));
-        pump.setFirstDose(RandomUtil.randomInt(100));
-        pump.setRemainDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setContinueDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setSelfControlLockTime(RandomUtil.randomInt(100));
-        pump.setPcaValidCount(RandomUtil.randomInt(100));
-        pump.setPcaInvalidCount(RandomUtil.randomInt(100));
-        pump.setPcaTotalCount(pump.getPcaInvalidCount()+pump.getPcaValidCount());
-        pump.setContinueDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-
-        pump.setPulseDose(RandomUtil.randomInt(100));
-        pump.setPulseLockTime(RandomUtil.randomInt(100));
-        pump.setPulseFirstLockTime(RandomUtil.randomInt(100));
-        pump.setFlowAdjustRate(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setFlowCount(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setFlowDownCycle(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setFlowDownLimit(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setFlowUpCycle(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setFlowUpLimit(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-
-        pump.setUploadTime(new Date());
-
-        return pump;
-    }
-}