diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java index c95a6d7..ab13be3 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java @@ -1,5 +1,6 @@ package com.ccsens.carbasics.bean.vo; +import cn.hutool.core.util.ObjectUtil; import com.ccsens.carbasics.util.Constant; import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.pagehelper.PageInfo; @@ -170,15 +171,20 @@ public class PatientVo { private Long projectId; @ApiModelProperty("上报情况 0:未上报 1:上报成功") private Byte reported; - public int getDataStatus() { - if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= Constant.MAX_UPDATE_NUMBER){ - return 100; + public Integer getDataStatus() { + if (ObjectUtil.isNull(times)) { + return dataStatus; } - if(dataStatus == Constant.DataStatus.DischargePass.status && times >= Constant.MAX_UPDATE_NUMBER){ - return 100; - } - if(dataStatus == Constant.DataStatus.ApplyForRefuse.status && times >= Constant.MAX_UPDATE_NUMBER){ - return 101; + if (ObjectUtil.isNotNull(dataStatus)) { + if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= Constant.MAX_UPDATE_NUMBER){ + return 100; + } + if(dataStatus == Constant.DataStatus.DischargePass.status && times >= Constant.MAX_UPDATE_NUMBER){ + return 100; + } + if(dataStatus == Constant.DataStatus.ApplyForRefuse.status && times >= Constant.MAX_UPDATE_NUMBER){ + return 101; + } } return dataStatus; }