瀏覽代碼

fix:
修改了一些bug

18339543638 1 年之前
父節點
當前提交
70470666c0

+ 1 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalInfusionRecord.java

@@ -58,6 +58,7 @@ public class ClinicAnalInfusionRecord extends DeviceProperties<String,String> {
     public static ClinicAnalInfusionRecord parse(BusInfusionHistoryEntity source){
     public static ClinicAnalInfusionRecord parse(BusInfusionHistoryEntity source){
         ClinicAnalInfusionRecord result = new ClinicAnalInfusionRecord();
         ClinicAnalInfusionRecord result = new ClinicAnalInfusionRecord();
         BeanUtil.copyProperties(source,result);
         BeanUtil.copyProperties(source,result);
+        result.setRemainDose(source.getRemainDose());
         if(source.getStartTime()!=null){
         if(source.getStartTime()!=null){
             result.setAnalExportStartTime(DateUtil.formatDateTime(source.getStartTime()));
             result.setAnalExportStartTime(DateUtil.formatDateTime(source.getStartTime()));
         }
         }

+ 4 - 3
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

@@ -11,6 +11,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -64,12 +65,12 @@ public class ClinicAnalRecordResult implements Serializable {
         this.infusionRecords=infusionRecords;
         this.infusionRecords=infusionRecords;
     }
     }
 
 
-    public String getRemainDose() {
+    public BigDecimal getRemainDose() {
         if (CollectionUtil.isEmpty(infusionRecords)) {
         if (CollectionUtil.isEmpty(infusionRecords)) {
             return null;
             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();
     }
     }
 
 
     /**
     /**