jiangjiazhi / regional-platform | GitLab

Commit ee0946da3e05024da158c9dd015cd37793f76f75

Authored by shiyang over 3 years ago

1 parent 4942dd56ec

Exists in master and in 6 other branches

邢台南河-孕妇追访增加-预约下次追访孕周

Showing 3 changed files with 13 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -82,7 +82,18 @@
82	82	* 追访数据保存的类型
83	83	*/
84	84	private Integer trackDownDateType;
	85	+ /**
	86	+ * 预约下次追访孕周
	87	+ */
	88	+ private String rstDueWeek;
85	89
	90	+ public String getRstDueWeek() {
	91	+ return rstDueWeek;
	92	+ }
	93	+
	94	+ public void setRstDueWeek(String rstDueWeek) {
	95	+ this.rstDueWeek = rstDueWeek;
	96	+ }
86	97
87	98	public String getTrackDownRecId() {
88	99	return trackDownRecId;

...	...	@@ -770,6 +770,7 @@
770	770	map.put("cardNo", patients.getCardNo());
771	771	map.put("age", DateUtil.getAge(patients.getBirth()));
772	772	map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
	773	+ map.put("lastMenses", patients.getLastMenses());//末次月经
773	774	map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
774	775	map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class)); /** 访视次数 */
775	776	map.put("sex", 0);

...	...	@@ -1308,6 +1308,7 @@
1308	1308	temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
1309	1309	temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
1310	1310	temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
	1311	+ temp.put("rstDueWeek", StringUtils.isEmpty(trackDown.getRstDueWeek())?"--":trackDown.getRstDueWeek());
1311	1312	tabList.add(temp);
1312	1313	}
1313	1314	return RespBuilder.buildSuccess(tabList);