diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index b44b23c..793abe6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -20,6 +20,7 @@ public class AntExChuModel implements Serializable { private Date dueDate; //末次月经 private Date lastMenses; + private String cDueWeek; // 既往史 private String pastHistory ; // 家族史 @@ -87,6 +88,14 @@ public class AntExChuModel implements Serializable { private Date created; private String hospitalId; + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + public String getHospitalId() { return hospitalId; } @@ -190,9 +199,9 @@ public class AntExChuModel implements Serializable { //产检 医生 private String prodDoctor; //产检日期 - private String checkTime; + private Date checkTime; //下次产检时间 - private String nextCheckTime; + private Date nextCheckTime; private Integer yn; //血红蛋白值 private String xhdb ; @@ -276,13 +285,6 @@ public class AntExChuModel implements Serializable { this.cestationInfo = cestationInfo; } - public String getCheckTime() { - return checkTime; - } - - public void setCheckTime(String checkTime) { - this.checkTime = checkTime; - } @@ -367,12 +369,19 @@ public class AntExChuModel implements Serializable { } + public Date getCheckTime() { + return checkTime; + } + + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } - public String getNextCheckTime() { + 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/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 7d36085..8fa6686 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; @@ -26,6 +27,7 @@ import com.lyms.platform.query.ReferralApplyOrderQuery; import com.lyms.platform.query.SieveApplyOrderQuery; import com.lyms.platform.query.SieveQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -163,7 +165,9 @@ public class ApplyOrderFacade { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge()); - referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeekStart()); + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getDueWeekStart())){ + referralApplyOrderQuery.setDueDateStart(DateUtil.parseYMD(applyOrderQueryRequest.getDueWeekStart())); + } referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor()); referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel()); referralApplyOrderQuery.setScore(applyOrderQueryRequest.getScore()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 24f040d..e4baaa6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -120,7 +120,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { //产检日期 private String checkTime; //下次产检时间 - private Map nextCheckTime; + private String nextCheckTime; + //前端计算出来的孕周 + private String cDueWeek; /**辅助检查结果录入 **/ //血红蛋白值 @@ -240,6 +242,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.chgOther = chgOther; } + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + public String getDueDate() { return dueDate; } @@ -674,11 +684,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.highriskSocre = highriskSocre; } - public Map getNextCheckTime() { + public String getNextCheckTime() { return nextCheckTime; } - public void setNextCheckTime(Map nextCheckTime) { + public void setNextCheckTime(String nextCheckTime) { this.nextCheckTime = nextCheckTime; } @@ -873,8 +883,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setTreatOpinion(treatOpinion); antExChuModel.setDirOpinion(dirOpinion); antExChuModel.setProdDoctor(prodDoctor); - antExChuModel.setCheckTime(checkTime); - antExChuModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime)); + if(null!=checkTime){ + antExChuModel.setCheckTime(DateUtil.parseYMD(checkTime)); + } + if(null!=nextCheckTime){ + antExChuModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime)); + } + antExChuModel.setcDueWeek(cDueWeek); if(StringUtils.isNotEmpty(lastMenses)){ antExChuModel.setLastMenses(DateUtil.parseYMD(lastMenses)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java index e19ea6f..ff862de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -64,7 +64,10 @@ public class AntData { String week = (days / 7) + ""; int day = (days % 7); this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); - this.checkTime = model.getCheckTime(); + if(null!=model.getCheckTime()){ + this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime()); + } + this.title="初诊"; this.type="2"; this.hospitalName=hospitalName; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 6cb9ed7..23d3c48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -41,6 +41,8 @@ public class AntexChuResult { //预产期 private String dueDate; + private String cDueWeek; + /** * 初检信息 **/ @@ -133,7 +135,7 @@ public class AntexChuResult { //产检日期 private String checkTime; //下次产检时间 - private Map nextCheckTime; + private String nextCheckTime; /** @@ -224,6 +226,14 @@ public class AntexChuResult { return syjg; } + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + public void setSyjg(String syjg) { this.syjg = syjg; } @@ -474,11 +484,11 @@ public class AntexChuResult { } - public Map getNextCheckTime() { + public String getNextCheckTime() { return nextCheckTime; } - public void setNextCheckTime(Map nextCheckTime) { + public void setNextCheckTime(String nextCheckTime) { this.nextCheckTime = nextCheckTime; } @@ -892,12 +902,11 @@ public class AntexChuResult { setTreatOpinion(antExChuModel.getTreatOpinion()); setDirOpinion(antExChuModel.getDirOpinion()); setProdDoctor(antExChuModel.getProdDoctor()); - setCheckTime(antExChuModel.getCheckTime()); - try { - - setNextCheckTime(JsonUtil.str2Obj(antExChuModel.getNextCheckTime(), Map.class)); - } catch (Exception e) { - + if(null!=antExChuModel.getCheckTime()){ + setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); + } + if(null!=antExChuModel.getNextCheckTime()){ + setNextCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); } setSyjg(antExChuModel.getSyjg()); setAbo(antExChuModel.getAbo()); @@ -927,7 +936,6 @@ public class AntexChuResult { setYgekt(antExChuModel.getYgekt()); setXqjq(antExChuModel.getXqjq()); setXnsd(antExChuModel.getXnsd()); -// setMdxqsy(antExChuModel.getMdxqsy()); setHivkt(antExChuModel.getHivkt()); setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class)); setYdqjd(antExChuModel.getYdqjd()); @@ -937,6 +945,7 @@ public class AntexChuResult { if(null!=antExChuModel.getLastMenses()) { setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses())); } + setcDueWeek(antExChuModel.getcDueWeek()); } return this; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java index 05dad4b..0265e32 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.enums.ApplyOrderStatusEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.ReferralApplyOrderModel; +import java.util.Date; import java.util.List; /** @@ -175,7 +176,12 @@ public class ApplyOrderInResult implements IBasicResultConvert0?"+"+day+"天":""); + } setrRisk(destModel.getrRisk()); setDueDate(DateUtil.getYmd(destModel.getDueDate())); setApplyDoctor(destModel.getApplyDoctor()); 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 a543595..599c124 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,6 +5,7 @@ import com.lyms.platform.common.enums.ApplyOrderStatusEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.ReferralApplyOrderModel; +import java.util.Date; import java.util.List; /** @@ -195,7 +196,12 @@ public class ApplyOrderOutResult implements IBasicResultConvert0?"+"+day+"天":""); + } setrRisk(destModel.getrRisk()); setDueDate(DateUtil.getYmd(destModel.getDueDate())); setApplyDoctor(destModel.getApplyDoctor()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index d93ace2..84a6007 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -230,7 +230,12 @@ public class ReferralApplyOrderResult { setParentId(destModel.getParentId()); setName(destModel.getName()); setAge(destModel.getAge()); - setDueWeek(destModel.getDueWeek()); + if(null!=destModel.getDueDate()){ + int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); + } setCardNo(destModel.getCardNo()); setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setrLevel(destModel.getrLevel());