diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java index 05aa17e..04617f4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java @@ -32,6 +32,16 @@ public class BabyVisitModel extends BaseModel { private Date created; private Date modified; + private String days; + + public String getDays() { + return days; + } + + public void setDays(String days) { + this.days = days; + } + /** * 新生儿的id */ @@ -65,6 +75,7 @@ public class BabyVisitModel extends BaseModel { this.modified = modified; } + /* // 名称 private String name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index e6d5024..ce2a4b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabyVisitModel; import com.lyms.platform.pojo.Patients; +import org.apache.commons.lang.StringUtils; import java.util.Map; @@ -753,6 +754,9 @@ public class BabyVisitAddRequest implements IBasicRequestConvert babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate)); babyVisitModel.setDoctorSign(doctorSign); babyVisitModel.setId(id); + if(StringUtils.isNotEmpty(birth)&&StringUtils.isNotEmpty(currentVisit)){ + babyVisitModel.setDays((DateUtil.getDays(DateUtil.parseYMD(birth), DateUtil.parseYMD(currentVisit)) + 1) + ""); + } return babyVisitModel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java index 4651daf..6a81c19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java @@ -236,11 +236,22 @@ public class BabyVisitResult implements IBasicResultConvert