jiangjiazhi / regional-platform

Authored by dongqin over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 22 additions and 1 deletions

...	...	@@ -148,6 +148,19 @@
148	148
149	149	private String hospitalId;
150	150
	151	+ /**
	152	+ * 最近检查时间
	153	+ */
	154	+ private Date latelyDate;
	155	+
	156	+ public Date getLatelyDate() {
	157	+ return latelyDate;
	158	+ }
	159	+
	160	+ public void setLatelyDate(Date latelyDate) {
	161	+ this.latelyDate = latelyDate;
	162	+ }
	163	+
151	164	// TODO 2019/6/29 15:55 dongqing 参数未完
152	165
153	166	public String getHospitalId() {

...	...	@@ -532,6 +532,10 @@
532	532	String diagnosisTimeStr = diagnosisTime == null ? "" : DateUtil.getyyyy_MM_dd(diagnosisTime);
533	533	objectMap.put("diagnosisTimeStr", diagnosisTimeStr);
534	534
	535	+ Date latelyDate = model.getLatelyDate();
	536	+ String latelyDateStr = latelyDate == null ? "" : DateUtil.getyyyy_MM_dd(latelyDate);
	537	+ objectMap.put("latelyDateStr", latelyDateStr);
	538	+
535	539	mapList.add(objectMap);
536	540	}
537	541
...	...	@@ -835,7 +839,10 @@
835	839	if (Objects.equals(TYPE_CHECK, type)) {
836	840	nextDate = new Date();
837	841	}
838		- mongoTemplate.updateFirst(query, Update.update("appointmentTime", nextDate), BabyAfterVisitInfoModel.class);
	842	+ Update update = new Update();
	843	+ update.set("appointmentTime", nextDate);
	844	+ update.set("latelyDate", new Date());
	845	+ mongoTemplate.updateFirst(query, update, BabyAfterVisitInfoModel.class);
839	846	if (Objects.equals(TYPE_BUILD, type)) {
840	847	// 针对档案转正时，将其状态直接更新为作废
841	848	mongoTemplate.updateFirst(query, Update.update("yn", 2), BabyAfterVisitInfoModel.class);

...	...	@@ -72,6 +72,7 @@
72	72	if (StringUtils.isNotEmpty(checkDoctorDb)) {
73	73	checkDoctor = checkDoctorDb;
74	74	}
	75	+ babyAfterVisitInfoModel.setLatelyDate(checkModel.getCheckDate());
75	76	}
76	77	babyAfterVisitInfoModel.setCheckDoctor(checkDoctor);
77	78	}