|
|
@@ -11,6 +11,7 @@ import lombok.Getter;
|
|
|
import lombok.Setter;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -64,12 +65,12 @@ public class ClinicAnalRecordResult implements Serializable {
|
|
|
this.infusionRecords=infusionRecords;
|
|
|
}
|
|
|
|
|
|
- public String getRemainDose() {
|
|
|
+ public BigDecimal getRemainDose() {
|
|
|
if (CollectionUtil.isEmpty(infusionRecords)) {
|
|
|
return null;
|
|
|
}
|
|
|
- return String.valueOf(CollectionUtil.getLast(infusionRecords.stream().sorted(Comparator.comparing(ClinicAnalInfusionRecord::getCreateTime)).collect(Collectors.toList()))
|
|
|
- .getRemainDose());
|
|
|
+ return CollectionUtil.getLast(infusionRecords.stream().sorted(Comparator.comparing(ClinicAnalInfusionRecord::getCreateTime)).collect(Collectors.toList()))
|
|
|
+ .getRemainDose();
|
|
|
}
|
|
|
|
|
|
/**
|