del 删除冗余字段

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceHistoryEntity.java

@@ -36,10 +36,6 @@ import java.util.Date;
 @ApiModel(value="设备历史运行数据", description="设备历史运行数据记录")
 public class BusDeviceHistoryEntity extends CommonDeviceParam<String,String> {
 
-//    @ApiModelProperty(value = "网络泵id")
-//    @JsonIgnoreProperties
-//    private String deviceId;
-
     @ApiModelProperty(value = "患者编号")
     private String patientId;
 
@@ -47,137 +43,10 @@ public class BusDeviceHistoryEntity extends CommonDeviceParam<String,String> {
     @JsonIgnoreProperties
     private String infusionId;
 
-//    @ApiModelProperty(value = "分包标记位",readOnly = true)
-//    @JsonIgnoreProperties(allowSetters = true)
-//    private String classification;
-//
-//    @ApiModelProperty(value = "数据编号",readOnly = true)
-//    @JsonIgnoreProperties(allowSetters = true)
-//    private String dataNumber;
-
     @ApiModelProperty(value = "输注修改记录id")
     @JsonIgnoreProperties
     private String infusionModifyId;
 
-
-//    @ApiModelProperty(value = "总量",readOnly = true)
-//    @Max(value = 999,message = "总量最大值不得超过999")
-//    @Min(value = 0,message ="总量最小值不得超过0" )
-//    private Integer totalDose;
-//
-//    @ApiModelProperty(value = "公共参数-首次量",readOnly = true)
-//    @Max(value = 50,message = "首次量最大值不得超过50")
-//    @Min(value = 0,message ="首次量最小值不得超过0" )
-//    private Integer firstDose;
-//
-//
-//    @ApiModelProperty(value = "公共参数-剩余量",readOnly = true)
-//    private BigDecimal remainDose;
-//
-//    @ApiModelProperty(value = "公共参数-已输入量",readOnly = true)
-//    private BigDecimal inputDose;
-//
-//    @ApiModelProperty(value = "公共参数-追加量",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendDose;
-//
-//    @ApiModelProperty(value = "公共参数-追加锁时",readOnly = true)
-//    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-极限量",readOnly = true)
-//    @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal maxDose;
-//
-//    @ApiModelProperty(value = "公共参数-自控锁时",readOnly = true)
-//    private Integer selfControlLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-自控次数",readOnly = true)
-//    private Integer selfControlCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca有效次数",readOnly = true)
-//    private Integer pcaValidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca无效次数",readOnly = true)
-//    private Integer pcaInvalidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca总按次数",readOnly = true)
-//    private Integer pcaTotalCount;
-//
-//    @ApiModelProperty(value = "持续泵参数-持续量",readOnly = true)
-//    @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
-//    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
-//    private BigDecimal continueDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲量",readOnly = true)
-//    @Max(value = 20,message = "脉冲量最大值不得超过20")
-//    @Min(value = 0,message ="脉冲量最小值不得超过0" )
-//    private Integer pulseDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",readOnly = true)
-//    @Max(value = 90,message = "脉冲锁时最大值不得超过90")
-//    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
-//    private Integer pulseLockTime;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",readOnly = true)
-//    @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
-//    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
-//    private Integer pulseFirstLockTime;
-//
-//    @ApiModelProperty(value = "智能泵参数-加档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
-//    private BigDecimal flowUpCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-减档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
-//    private BigDecimal flowDownCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-计次",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
-//    private BigDecimal flowCount;
-//
-//    @ApiModelProperty(value = "智能泵参数-上限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
-//    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
-//    private BigDecimal flowUpLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-下限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
-//    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
-//    private BigDecimal flowDownLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-自调比例",readOnly = true)
-//    @DecimalMax(value = "95",message = "自调比例不得超过95")
-//    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
-//    private BigDecimal flowAdjustRate;
-//
-//
-//    @ApiModelProperty(value = "泵运行状态",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.IGNORED)
-//    private DeviceStatusEnum runState;
-//
-//    @ApiModelProperty(value = "报警信息",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.IGNORED)
-//    private DeviceAlarmEnum alarm;
-//
-//    @ApiModelProperty(value = "报警原因")
-//    private String alarmCause;
-//
-//    @ApiModelProperty(value = "输注即将结束提醒",readOnly = true)
-//    private Boolean warnWillFinished;
-//
-//    @ApiModelProperty(value = "镇痛不足提醒",readOnly = true)
-//    private Boolean warnAnalgesicPoor;
-//
-//    @ApiModelProperty(value = "电量偏低提醒",readOnly = true)
-//    private Boolean warnLowBattery;
-
     @ApiModelProperty(value = "是否已撤泵,0、未撤泵1、已撤泵")
     @JsonIgnoreProperties
     private Boolean isUndo;
@@ -186,11 +55,6 @@ public class BusDeviceHistoryEntity extends CommonDeviceParam<String,String> {
     @JsonIgnoreProperties
     private Boolean master;
 
-//
-//    @ApiModelProperty(value = "泵类型",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.NEVER)
-//    private DeviceTypeEnum type;
-
     @ApiModelProperty(value = "数据上传时间",readOnly = true,hidden = true)
     @JsonIgnoreProperties(allowSetters = true)
     private Date uploadTime;

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

@@ -43,15 +43,9 @@ import java.util.Date;
 @ApiModel(value="设备运行状态", description="设备运行状态")
 public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
 
-//    @ApiModelProperty(value = "网络泵id",readOnly = true)
-//    private String deviceId;
-
     @ApiModelProperty(value = "输注记录")
     private String infusionId;
 
-//    @ApiModelProperty(value = "病号")
-//    private String patientCode;
-
     @ApiModelProperty(value = "临床号")
     private String clinicId;
 
@@ -62,133 +56,11 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
     @ApiModelProperty(value = "病人性别")
     private SexEnum patientSex;
 
-//    @ApiModelProperty(value = "病区")
-//    private String ward;
-//
-//    @ApiModelProperty(value = "床号")
-//    private String bedNo;
     /***************临床固定数据*****************/
 
     @ApiModelProperty(value = "设备别名")
     private String alias;
 
-//    @ApiModelProperty(value = "总量",readOnly = true)
-//    @Max(value = 999,message = "总量最大值不得超过999")
-//    @Min(value = 0,message ="总量最小值不得超过0" )
-//    private Integer totalDose;
-
-//    @ApiModelProperty(value = "公共参数-首次量",readOnly = true)
-//    @Max(value = 50,message = "首次量最大值不得超过50")
-//    @Min(value = 0,message ="首次量最小值不得超过0" )
-//    private Integer firstDose;
-
-
-//    @ApiModelProperty(value = "公共参数-剩余量",readOnly = true)
-//    private BigDecimal remainDose;
-
-//    @ApiModelProperty(value = "公共参数-已输入量",readOnly = true)
-//    private BigDecimal inputDose;
-
-//    @ApiModelProperty(value = "公共参数-追加量",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendDose;
-
-//    @ApiModelProperty(value = "公共参数-追加锁时",readOnly = true)
-//    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendLockTime;
-
-//    @ApiModelProperty(value = "公共参数-极限量",readOnly = true)
-//    @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal maxDose;
-
-//    @ApiModelProperty(value = "公共参数-自控锁时",readOnly = true)
-//    private Integer selfControlLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-自控次数",readOnly = true)
-//    private Integer selfControlCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca有效次数",readOnly = true)
-//    private Integer pcaValidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca无效次数",readOnly = true)
-//    private Integer pcaInvalidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca总按次数",readOnly = true)
-//    private Integer pcaTotalCount;
-//
-//    @ApiModelProperty(value = "公共参数-持续量(流速)",readOnly = true)
-//    @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
-//    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
-//    private BigDecimal continueDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲量",readOnly = true)
-//    @Max(value = 20,message = "脉冲量最大值不得超过20")
-//    @Min(value = 0,message ="脉冲量最小值不得超过0" )
-//    private Integer pulseDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",readOnly = true)
-//    @Max(value = 90,message = "脉冲锁时最大值不得超过90")
-//    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
-//    private Integer pulseLockTime;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",readOnly = true)
-//    @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
-//    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
-//    private Integer pulseFirstLockTime;
-//
-//    @ApiModelProperty(value = "智能泵参数-加档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
-//    private BigDecimal flowUpCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-减档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
-//    private BigDecimal flowDownCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-计次",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
-//    private BigDecimal flowCount;
-//
-//    @ApiModelProperty(value = "智能泵参数-上限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
-//    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
-//    private BigDecimal flowUpLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-下限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
-//    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
-//    private BigDecimal flowDownLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-自调比例",readOnly = true)
-//    @DecimalMax(value = "95",message = "自调比例不得超过95")
-//    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
-//    private BigDecimal flowAdjustRate;
-//
-//
-//    @ApiModelProperty(value = "泵运行状态",readOnly = true)
-////    @TableField(typeHandler = EnumTypeHandler.class,javaType = true,updateStrategy = FieldStrategy.IGNORED)
-//    @TableField(updateStrategy = FieldStrategy.IGNORED)
-//    private DeviceStatusEnum runState;
-//
-//    @ApiModelProperty(value = "报警信息",readOnly = true)
-////    @TableField(typeHandler = EnumTypeHandler.class,javaType = true,updateStrategy = FieldStrategy.IGNORED)
-//    @TableField(updateStrategy = FieldStrategy.IGNORED)
-//    private DeviceAlarmEnum alarm;
-
-//    @ApiModelProperty(value = "输注即将结束提醒",readOnly = true)
-//    private Boolean warnWillFinished;
-//
-//    @ApiModelProperty(value = "镇痛不足提醒",readOnly = true)
-//    private Boolean warnAnalgesicPoor;
-//
-//    @ApiModelProperty(value = "电量偏低提醒",readOnly = true)
-//    private Boolean warnLowBattery;
-
     @ApiModelProperty(value = "输注开始时间,即本次运行开机时间",readOnly = true)
     private Date startTime;
 
@@ -207,13 +79,6 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
     @JsonIgnoreProperties(allowSetters = true)
     private Boolean master;
 
-    @ApiModelProperty(value = "分包标记位",readOnly = true)
-    @JsonIgnoreProperties(allowSetters = true)
-    private String classification;
-
-    @ApiModelProperty(value = "泵类型",readOnly = true)
-    @TableField(javaType = true,updateStrategy = FieldStrategy.NEVER)
-    private DeviceTypeEnum type;
 
     @ApiModelProperty(value = "数据上传时间",readOnly = true,hidden = true)
     @JsonIgnoreProperties(allowSetters = true)

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

@@ -39,8 +39,6 @@ import java.util.Date;
 @TableName(value = "bus_infusion_history",autoResultMap = true)
 @ApiModel(value="设备输注历史信息记录", description="设备的classification标识每改变一次，就算一次新的输注记录")
 public class BusInfusionHistoryEntity extends CommonDeviceParam<String,String> {
-//    @ApiModelProperty(value = "网络泵id",readOnly = true)
-//    private String deviceId;
 
     @ApiModelProperty(value = "临床号")
     private String clinicId;
@@ -48,151 +46,6 @@ public class BusInfusionHistoryEntity extends CommonDeviceParam<String,String> {
     @ApiModelProperty(value = "患者编号")
     private String patientId;
 
-//    @ApiModelProperty(value = "数据分类号，标识某些数据属于同一个输注",readOnly = true)
-//    @JsonIgnoreProperties(allowSetters = true)
-//    private String classification;
-//
-//    @ApiModelProperty(value = "数据编号",readOnly = true)
-//    @JsonIgnoreProperties(allowSetters = true)
-//    private String dataNumber;
-//
-//    @ApiModelProperty(value = "泵类型",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.NEVER)
-//    private DeviceTypeEnum deviceType;
-
-//    @ApiModelProperty(value = "住院号")
-//    private String patientCode;
-
-
-    /***************临床固定数据*****************/
-//    @ApiModelProperty(value = "病区")
-//    private String ward;
-//
-//    @ApiModelProperty(value = "床号")
-//    private String bedNo;
-    /***************临床固定数据*****************/
-
-//    @ApiModelProperty(value = "总量",readOnly = true)
-//    @Max(value = 999,message = "总量最大值不得超过999")
-//    @Min(value = 0,message ="总量最小值不得超过0" )
-//    private Integer totalDose;
-//
-//    @ApiModelProperty(value = "公共参数-首次量",readOnly = true)
-//    @Max(value = 50,message = "首次量最大值不得超过50")
-//    @Min(value = 0,message ="首次量最小值不得超过0" )
-//    private Integer firstDose;
-//
-//
-//    @ApiModelProperty(value = "公共参数-剩余量",readOnly = true)
-//    private BigDecimal remainDose;
-//
-//    @ApiModelProperty(value = "公共参数-已输入量",readOnly = true)
-//    private BigDecimal inputDose;
-//
-//    @ApiModelProperty(value = "公共参数-追加量",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendDose;
-//
-//    @ApiModelProperty(value = "公共参数-追加锁时",readOnly = true)
-//    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-极限量",readOnly = true)
-//    @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal maxDose;
-//
-//    @ApiModelProperty(value = "公共参数-自控锁时",readOnly = true)
-//    private Integer selfControlLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-自控次数",readOnly = true)
-//    private Integer selfControlCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca有效次数",readOnly = true)
-//    private Integer pcaValidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca无效次数",readOnly = true)
-//    private Integer pcaInvalidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca总按次数",readOnly = true)
-//    private Integer pcaTotalCount;
-//
-//    @ApiModelProperty(value = "持续泵参数-持续量",readOnly = true)
-//    @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
-//    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
-//    private BigDecimal continueDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲量",readOnly = true)
-//    @Max(value = 20,message = "脉冲量最大值不得超过20")
-//    @Min(value = 0,message ="脉冲量最小值不得超过0" )
-//    private Integer pulseDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",readOnly = true)
-//    @Max(value = 90,message = "脉冲锁时最大值不得超过90")
-//    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
-//    private Integer pulseLockTime;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",readOnly = true)
-//    @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
-//    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
-//    private Integer pulseFirstLockTime;
-//
-//    @ApiModelProperty(value = "智能泵参数-加档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
-//    private BigDecimal flowUpCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-减档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
-//    private BigDecimal flowDownCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-计次",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
-//    private BigDecimal flowCount;
-//
-//    @ApiModelProperty(value = "智能泵参数-上限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
-//    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
-//    private BigDecimal flowUpLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-下限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
-//    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
-//    private BigDecimal flowDownLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-自调比例",readOnly = true)
-//    @DecimalMax(value = "95",message = "自调比例不得超过95")
-//    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
-//    private BigDecimal flowAdjustRate;
-//
-//    @ApiModelProperty(value = "加减档提示",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.DEFAULT)
-//    private FlowStatusEnum warnFlow;
-//
-//    @ApiModelProperty(value = "公共参数-电量",readOnly = true)
-//    private Integer electricQuantity;
-//
-//    @ApiModelProperty(value = "泵运行状态",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.IGNORED)
-//    private DeviceStatusEnum runState;
-//
-//    @ApiModelProperty(value = "报警信息",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.IGNORED)
-//    private DeviceAlarmEnum alarm;
-//
-//    @ApiModelProperty(value = "输注即将结束提醒",readOnly = true)
-//    private Boolean warnWillFinished;
-//
-//    @ApiModelProperty(value = "镇痛不足提醒",readOnly = true)
-//    private Boolean warnAnalgesicPoor;
-//
-//    @ApiModelProperty(value = "电量偏低提醒",readOnly = true)
-//    private Boolean warnLowBattery;
-
     @ApiModelProperty(value = "输注开始时间,即本次运行开机时间",readOnly = true)
     private Date startTime;
 

coffee-system/src/main/java/com/coffee/bus/entity/BusInfusionModifyEntity.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.entity.common.CommonDeviceParam;
+import com.coffee.bus.entity.common.DeviceProperties;
 import com.coffee.bus.enums.DeviceTypeEnum;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -36,121 +37,15 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName(value = "bus_infusion_modify",autoResultMap = true)
 @ApiModel(value="设备输注参数修改记录", description="当输注参数发生修改时,在此表中进行记录")
-public class BusInfusionModifyEntity extends CommonDeviceParam<String,String> {
-//    @ApiModelProperty(value = "网络泵id",readOnly = true)
-//    private String deviceId;
+public class BusInfusionModifyEntity extends DeviceProperties<String,String> {
 
     @ApiModelProperty(value = "输注记录")
     private String infusionId;
 
-//    @ApiModelProperty(value = "泵类型",readOnly = true)
-//    @TableField(updateStrategy = FieldStrategy.NEVER)
-//    private DeviceTypeEnum type;
-
-//    @ApiModelProperty(value = "总量",readOnly = true)
-//    @Max(value = 999,message = "总量最大值不得超过999")
-//    @Min(value = 0,message ="总量最小值不得超过0" )
-//    private Integer totalDose;
-//
-//    @ApiModelProperty(value = "公共参数-首次量",readOnly = true)
-//    @Max(value = 50,message = "首次量最大值不得超过50")
-//    @Min(value = 0,message ="首次量最小值不得超过0" )
-//    private Integer firstDose;
-//
-//    @ApiModelProperty(value = "公共参数-剩余量",readOnly = true)
-//    private BigDecimal remainDose;
-//
-//    @ApiModelProperty(value = "公共参数-已输入量",readOnly = true)
-//    private BigDecimal inputDose;
-//
-//    @ApiModelProperty(value = "公共参数-追加量",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendDose;
-//
-//    @ApiModelProperty(value = "公共参数-追加锁时",readOnly = true)
-//    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal appendLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-极限量",readOnly = true)
-//    @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
-//    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-//    private BigDecimal maxDose;
-//
-//    @ApiModelProperty(value = "公共参数-自控锁时",readOnly = true)
-//    private Integer selfControlLockTime;
-//
-//    @ApiModelProperty(value = "公共参数-自控次数",readOnly = true)
-//    private Integer selfControlCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca有效次数",readOnly = true)
-//    private Integer pcaValidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca无效次数",readOnly = true)
-//    private Integer pcaInvalidCount;
-//
-//    @ApiModelProperty(value = "公共参数-pca总按次数",readOnly = true)
-//    private Integer pcaTotalCount;
-//
-//    @ApiModelProperty(value = "持续泵参数-持续量",readOnly = true)
-//    @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
-//    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
-//    private BigDecimal continueDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲量",readOnly = true)
-//    @Max(value = 20,message = "脉冲量最大值不得超过20")
-//    @Min(value = 0,message ="脉冲量最小值不得超过0" )
-//    private Integer pulseDose;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",readOnly = true)
-//    @Max(value = 90,message = "脉冲锁时最大值不得超过90")
-//    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
-//    private Integer pulseLockTime;
-//
-//    @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",readOnly = true)
-//    @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
-//    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
-//    private Integer pulseFirstLockTime;
-//
-//    @ApiModelProperty(value = "智能泵参数-加档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
-//    private BigDecimal flowUpCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-减档周期",readOnly = true)
-//    @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
-//    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
-//    private BigDecimal flowDownCycle;
-//
-//    @ApiModelProperty(value = "智能泵参数-计次",readOnly = true)
-//    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-//    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
-//    private BigDecimal flowCount;
-//
-//    @ApiModelProperty(value = "智能泵参数-上限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
-//    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
-//    private BigDecimal flowUpLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-下限",readOnly = true)
-//    @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
-//    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
-//    private BigDecimal flowDownLimit;
-//
-//    @ApiModelProperty(value = "智能泵参数-自调比例",readOnly = true)
-//    @DecimalMax(value = "95",message = "自调比例不得超过95")
-//    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
-//    private BigDecimal flowAdjustRate;
-
     @ApiModelProperty(value = "参数修改时间")
     private Date modifyTime;
 
 
-//    @ApiModelProperty(value = "分包标记位",readOnly = true)
-//    @JsonIgnoreProperties(allowSetters = true)
-//    private String classification;
-
     public static BusInfusionModifyEntity parseRunningInfo(BusDeviceRunningEntity running){
         BusInfusionModifyEntity entity = new BusInfusionModifyEntity();
         entity.setDeviceId(running.getDeviceId());

coffee-system/src/main/java/com/coffee/bus/entity/common/CommonDeviceParam.java

@@ -27,130 +27,7 @@ import java.math.BigDecimal;
  */
 @Accessors(chain = true)
 @Data
-public class CommonDeviceParam<PK,TN>  extends TenantGenericEntity<PK,TN>  {
-    @ApiModelProperty(value = "网络泵id",readOnly = true)
-    private String deviceId;
-
-    @ApiModelProperty(value = "数据分类号，标识某些数据属于同一个输注",readOnly = true)
-    @JsonIgnoreProperties(allowSetters = true)
-    private String classification;
-
-    @ApiModelProperty(value = "数据编号",readOnly = true)
-    @JsonIgnoreProperties(allowSetters = true)
-    private Integer dataNumber;
-
-    @ApiModelProperty(value = "泵类型",readOnly = true)
-    @TableField(updateStrategy = FieldStrategy.NEVER)
-    private DeviceTypeEnum type;
-
-    @ApiModelProperty(value = "住院号")
-    private String patientCode;
-
-    @ApiModelProperty(value = "病区")
-    private String ward;
-
-    @ApiModelProperty(value = "床号")
-    private String bedNo;
-
-    @ApiModelProperty(value = "总量",readOnly = true)
-    @Max(value = 999,message = "总量最大值不得超过999")
-    @Min(value = 0,message ="总量最小值不得超过0" )
-    private Integer totalDose;
-
-    @ApiModelProperty(value = "公共参数-首次量",readOnly = true)
-    @Max(value = 50,message = "首次量最大值不得超过50")
-    @Min(value = 0,message ="首次量最小值不得超过0" )
-    private Integer firstDose;
-
-
-    @ApiModelProperty(value = "公共参数-剩余量",readOnly = true)
-    private BigDecimal remainDose;
-
-    @ApiModelProperty(value = "公共参数-已输入量",readOnly = true)
-    private BigDecimal inputDose;
-
-    @ApiModelProperty(value = "公共参数-追加量",readOnly = true)
-    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-    private BigDecimal appendDose;
-
-    @ApiModelProperty(value = "公共参数-追加锁时",readOnly = true)
-    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
-    private BigDecimal appendLockTime;
-
-    @ApiModelProperty(value = "公共参数-极限量",readOnly = true)
-    @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
-    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
-    private BigDecimal maxDose;
-
-    @ApiModelProperty(value = "公共参数-自控锁时",readOnly = true)
-    private Integer selfControlLockTime;
-
-    @ApiModelProperty(value = "公共参数-自控次数",readOnly = true)
-    private Integer selfControlCount;
-
-    @ApiModelProperty(value = "公共参数-pca有效次数",readOnly = true)
-    private Integer pcaValidCount;
-
-    @ApiModelProperty(value = "公共参数-pca无效次数",readOnly = true)
-    private Integer pcaInvalidCount;
-
-    @ApiModelProperty(value = "公共参数-pca总按次数",readOnly = true)
-    private Integer pcaTotalCount;
-
-    @ApiModelProperty(value = "持续泵参数-持续量",readOnly = true)
-    @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
-    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
-    private BigDecimal continueDose;
-
-    @ApiModelProperty(value = "脉冲泵参数-脉冲量",readOnly = true)
-    @Max(value = 20,message = "脉冲量最大值不得超过20")
-    @Min(value = 0,message ="脉冲量最小值不得超过0" )
-    private Integer pulseDose;
-
-    @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",readOnly = true)
-    @Max(value = 90,message = "脉冲锁时最大值不得超过90")
-    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
-    private Integer pulseLockTime;
-
-    @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",readOnly = true)
-    @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
-    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
-    private Integer pulseFirstLockTime;
-
-    @ApiModelProperty(value = "智能泵参数-加档周期",readOnly = true)
-    @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
-    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
-    private BigDecimal flowUpCycle;
-
-    @ApiModelProperty(value = "智能泵参数-减档周期",readOnly = true)
-    @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
-    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
-    private BigDecimal flowDownCycle;
-
-    @ApiModelProperty(value = "智能泵参数-计次",readOnly = true)
-    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
-    private BigDecimal flowCount;
-
-    @ApiModelProperty(value = "智能泵参数-上限",readOnly = true)
-    @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
-    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
-    private BigDecimal flowUpLimit;
-
-    @ApiModelProperty(value = "智能泵参数-下限",readOnly = true)
-    @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
-    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
-    private BigDecimal flowDownLimit;
-
-    @ApiModelProperty(value = "智能泵参数-自调比例",readOnly = true)
-    @DecimalMax(value = "95",message = "自调比例不得超过95")
-    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
-    private BigDecimal flowAdjustRate;
-
-    @ApiModelProperty(value = "公共参数-电量",readOnly = true)
-    private Integer electricQuantity;
+public class CommonDeviceParam<PK,TN>  extends DeviceProperties<PK,TN>  {
 
     @ApiModelProperty(value = "泵运行状态",readOnly = true)
     @TableField(updateStrategy = FieldStrategy.IGNORED)

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

@@ -0,0 +1,149 @@
+package com.coffee.bus.entity.common;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.coffee.bus.enums.DeviceTypeEnum;
+import com.coffee.common.entity.TenantGenericEntity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.math.BigDecimal;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName DeviceProperties.java
+ * @Description 设备上传属性（不包含报警、提醒字段）
+ * @createTime 2022年05月06日 09:06:00
+ */
+@Data
+public class DeviceProperties<PK,TN>  extends TenantGenericEntity<PK,TN> {
+    @ApiModelProperty(value = "网络泵id",readOnly = true)
+    private String deviceId;
+
+    @ApiModelProperty(value = "数据分类号，标识某些数据属于同一个输注",readOnly = true)
+    @JsonIgnoreProperties(allowSetters = true)
+    private String classification;
+
+    @ApiModelProperty(value = "数据编号",readOnly = true)
+    @JsonIgnoreProperties(allowSetters = true)
+    private Integer dataNumber;
+
+    @ApiModelProperty(value = "泵类型",readOnly = true)
+    @TableField(updateStrategy = FieldStrategy.NEVER)
+    private DeviceTypeEnum type;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "病区")
+    private String ward;
+
+    @ApiModelProperty(value = "床号")
+    private String bedNo;
+
+    @ApiModelProperty(value = "总量",readOnly = true)
+    @Max(value = 999,message = "总量最大值不得超过999")
+    @Min(value = 0,message ="总量最小值不得超过0" )
+    private Integer totalDose;
+
+    @ApiModelProperty(value = "公共参数-首次量",readOnly = true)
+    @Max(value = 50,message = "首次量最大值不得超过50")
+    @Min(value = 0,message ="首次量最小值不得超过0" )
+    private Integer firstDose;
+
+
+    @ApiModelProperty(value = "公共参数-剩余量",readOnly = true)
+    private BigDecimal remainDose;
+
+    @ApiModelProperty(value = "公共参数-已输入量",readOnly = true)
+    private BigDecimal inputDose;
+
+    @ApiModelProperty(value = "公共参数-追加量",readOnly = true)
+    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
+    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
+    private BigDecimal appendDose;
+
+    @ApiModelProperty(value = "公共参数-追加锁时",readOnly = true)
+    @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
+    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
+    private BigDecimal appendLockTime;
+
+    @ApiModelProperty(value = "公共参数-极限量",readOnly = true)
+    @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
+    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
+    private BigDecimal maxDose;
+
+    @ApiModelProperty(value = "公共参数-自控锁时",readOnly = true)
+    private Integer selfControlLockTime;
+
+    @ApiModelProperty(value = "公共参数-自控次数",readOnly = true)
+    private Integer selfControlCount;
+
+    @ApiModelProperty(value = "公共参数-pca有效次数",readOnly = true)
+    private Integer pcaValidCount;
+
+    @ApiModelProperty(value = "公共参数-pca无效次数",readOnly = true)
+    private Integer pcaInvalidCount;
+
+    @ApiModelProperty(value = "公共参数-pca总按次数",readOnly = true)
+    private Integer pcaTotalCount;
+
+    @ApiModelProperty(value = "持续泵参数-持续量",readOnly = true)
+    @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
+    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
+    private BigDecimal continueDose;
+
+    @ApiModelProperty(value = "脉冲泵参数-脉冲量",readOnly = true)
+    @Max(value = 20,message = "脉冲量最大值不得超过20")
+    @Min(value = 0,message ="脉冲量最小值不得超过0" )
+    private Integer pulseDose;
+
+    @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",readOnly = true)
+    @Max(value = 90,message = "脉冲锁时最大值不得超过90")
+    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
+    private Integer pulseLockTime;
+
+    @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",readOnly = true)
+    @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
+    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
+    private Integer pulseFirstLockTime;
+
+    @ApiModelProperty(value = "智能泵参数-加档周期",readOnly = true)
+    @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
+    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
+    private BigDecimal flowUpCycle;
+
+    @ApiModelProperty(value = "智能泵参数-减档周期",readOnly = true)
+    @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
+    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
+    private BigDecimal flowDownCycle;
+
+    @ApiModelProperty(value = "智能泵参数-计次",readOnly = true)
+    @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
+    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
+    private BigDecimal flowCount;
+
+    @ApiModelProperty(value = "智能泵参数-上限",readOnly = true)
+    @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
+    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
+    private BigDecimal flowUpLimit;
+
+    @ApiModelProperty(value = "智能泵参数-下限",readOnly = true)
+    @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
+    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
+    private BigDecimal flowDownLimit;
+
+    @ApiModelProperty(value = "智能泵参数-自调比例",readOnly = true)
+    @DecimalMax(value = "95",message = "自调比例不得超过95")
+    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
+    private BigDecimal flowAdjustRate;
+
+    @ApiModelProperty(value = "公共参数-电量",readOnly = true)
+    private Integer electricQuantity;
+}