jiangjiazhi / regional-platform

Commit e37f336e8dc17f68c25dd828ea10b1b24e200643

Authored by litao@lymsh.com over 7 years ago

Exists in master and in 6 other branches

追访相关

Showing 2 changed files with 7 additions and 5 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownTypeEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -25,7 +25,7 @@
25	25	return value.getName();
26	26	}
27	27	}
28		- return null;
	28	+ return "--";
29	29	}
30	30	private Integer id;
31	31	private String name;

...	...	@@ -252,7 +252,9 @@
252	252	List<ResidentsArchiveModel> residentsArchiveModels = (List<ResidentsArchiveModel>) pageResult.getGrid();
253	253	for (ResidentsArchiveModel residentsArchiveModel : residentsArchiveModels) {
254	254	Map<String, Object> temp = new HashMap<>();
255		- temp.put("id", residentsArchiveModel.getId());
	255	+ Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(residentsArchiveModel.getCertificateNum())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
	256	+ temp.put("id", patients == null ? null : patients.getId());
	257	+ temp.put("residentsArchiveId", residentsArchiveModel.getId());
256	258	temp.put("username", residentsArchiveModel.getUsername());
257	259	temp.put("cardNo", residentsArchiveModel.getCertificateNum());
258	260	temp.put("residenceAddress", mongoUtil.findAddressName(residentsArchiveModel.getProvinceId(), residentsArchiveModel.getCityId(), residentsArchiveModel.getAreaId(), residentsArchiveModel.getStreetId())); /** 居住地 */
259	261
...	...	@@ -339,11 +341,11 @@
339	341	setTrackType();
340	342	return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
341	343	}
342		- List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("trackType").is(trackType).and("yn").is(1)), TrackDown.class);
	344	+ List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class);
343	345	for (TrackDown trackDown : trackDowns) {
344	346	Map<String, Object> temp = new HashMap<>();
345		- temp.put("trackDownDate", DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
346		- temp.put("trackDownUser", trackDown.getTrackDownUserId());
	347	+ temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
	348	+ temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
347	349	temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType()));
348	350	temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
349	351	temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));