|
|
@@ -56,10 +56,22 @@ public class ClinicAnalRecordResult implements Serializable {
|
|
|
@Setter
|
|
|
private Date undoTime;
|
|
|
|
|
|
+ @ApiModelProperty("药液剩余量")
|
|
|
+ @Setter
|
|
|
+ private String remainDose;
|
|
|
+
|
|
|
private void setInfusionRecords(List<ClinicAnalInfusionRecord> infusionRecords){
|
|
|
this.infusionRecords=infusionRecords;
|
|
|
}
|
|
|
|
|
|
+ public String getRemainDose() {
|
|
|
+ if (CollectionUtil.isEmpty(infusionRecords)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ return String.valueOf(CollectionUtil.getLast(infusionRecords.stream().sorted(Comparator.comparing(ClinicAnalInfusionRecord::getCreateTime)).collect(Collectors.toList()))
|
|
|
+ .getRemainDose());
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 描述: 填充撤泵信息
|
|
|
* @author lifang
|