diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 14cba9c..e7f5027 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -83,13 +83,22 @@ public class AntenatalExaminationModel { //产检医生 private String checkDoctor; //产检日期 - private String checkDate; + private Date checkDate; //下次产检日期 - private String nextCheckTime; + private Date nextCheckTime; private Integer yn; private Date created; private Date modified; private String hospitalId; + private String cDueWeek; + + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } public Date getModified() { return modified; @@ -163,13 +172,7 @@ public class AntenatalExaminationModel { this.bp = bp; } - public String getCheckDate() { - return checkDate; - } - public void setCheckDate(String checkDate) { - this.checkDate = checkDate; - } public String getCheckDoctor() { return checkDoctor; @@ -243,11 +246,19 @@ public class AntenatalExaminationModel { this.id = id; } - public String getNextCheckTime() { + public Date getCheckDate() { + return checkDate; + } + + public void setCheckDate(Date checkDate) { + this.checkDate = checkDate; + } + + public Date getNextCheckTime() { return nextCheckTime; } - public void setNextCheckTime(String nextCheckTime) { + public void setNextCheckTime(Date nextCheckTime) { this.nextCheckTime = nextCheckTime; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 5ea33b6..7afb7d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -271,7 +271,7 @@ public class PatientFacade { List ant = antExService.queryAntenatalExamination(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); String nextCheckTime = ""; if (CollectionUtils.isNotEmpty(ant)) { - nextCheckTime = ant.get(0).getNextCheckTime(); + nextCheckTime = DateUtil.getyyyy_MM_dd(ant.get(0).getNextCheckTime()); } chanResult.setNextCheckTime(nextCheckTime); data.add(chanResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 7fdee1c..768c7bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.AntenatalExaminationModel; import org.codehaus.jackson.annotate.JsonIgnore; @@ -69,9 +70,21 @@ public class AntExAddRequest implements IBasicRequestConvert