فهرست منبع

fix:
修改了一些bug

18339543638 1 سال پیش
والد
کامیت
8ef6ab24c0

+ 12 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

@@ -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

+ 1 - 1
nb-service/web-service/src/main/java/com/nb/web/service/system/auth/DefaultAccountOperator.java

@@ -111,7 +111,7 @@ public class DefaultAccountOperator implements IAccountOperator {
         LoginUser<Long> loginUser = SecurityUtil.getLoginUser();
         SysUser sysUser = sysUserService.getById(loginUser.getId());
         AccountInfoVO accountInfoVO = BeanUtil.copyProperties(sysUser, AccountInfoVO.class);
-        accountInfoVO.setRealName(sysUser.getNickname());
+        accountInfoVO.setRealName(sysUser.getRealname());
         return accountInfoVO;
     }