diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 97641e6..98d10c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -5,7 +5,9 @@ import com.lyms.platform.common.enums.ApplyOrderStatusEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.ReferralApplyOrderModel; +import org.apache.commons.collections.CollectionUtils; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -29,7 +31,7 @@ public class ApplyOrderOutResult { private String rLevel; //风险因素 private List rRisk; - private Integer score; + private Integer score=0; //病情描述 private String diseaseDesc; //转院必要性 @@ -224,6 +226,12 @@ public class ApplyOrderOutResult { } public List getrRisk() { + if(CollectionUtils.isEmpty(rRisk)){ + List list = new ArrayList<>(); + list.add("-"); + return list; + } + return rRisk; } @@ -232,6 +240,9 @@ public class ApplyOrderOutResult { } public Integer getScore() { + if(null==score){ + return 0; + } return score; } @@ -283,7 +294,7 @@ public class ApplyOrderOutResult { setPotentialRisk(destModel.getPotentialRisk()); setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus())); setTransferredHospital(destModel.getTransferredHospital()); - setAge(destModel.getAge()); + setAge(DateUtil.getAge(destModel.getBirth())); setCardNo(destModel.getCardNo()); setPhone(destModel.getPhone()); return this;