diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java index cb635e9..8f39b7c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java @@ -82,7 +82,18 @@ public class TrackDown extends BaseModel { * 追访数据保存的类型 */ private Integer trackDownDateType; + /** + * 预约下次追访孕周 + */ + private String rstDueWeek; + public String getRstDueWeek() { + return rstDueWeek; + } + + public void setRstDueWeek(String rstDueWeek) { + this.rstDueWeek = rstDueWeek; + } public String getTrackDownRecId() { return trackDownRecId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index f38fb19..c7ce895 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -770,6 +770,7 @@ public class TrackDownFacade { map.put("cardNo", patients.getCardNo()); map.put("age", DateUtil.getAge(patients.getBirth())); map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); + map.put("lastMenses", patients.getLastMenses());//末次月经 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */ map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class)); /** 访视次数 */ map.put("sex", 0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 6a7126d..0583e0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -1308,6 +1308,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("rstDueWeek", StringUtils.isEmpty(trackDown.getRstDueWeek())?"--":trackDown.getRstDueWeek()); tabList.add(temp); } return RespBuilder.buildSuccess(tabList);