jiangjiazhi / regional-platform

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 32 additions and 0 deletions

...	...	@@ -57,6 +57,7 @@
57	57	lhServiceFollowModel.setHospitalId(hospitalId);
58	58	lhServiceFollowModel.setCreated(new Date());
59	59	lhServiceFollowModel.setModified(new Date());
	60	+ lhServiceFollowModel.setYn(YnEnums.YES.getId());
60	61	mongoTemplate.save(lhServiceFollowModel);
61	62	}
62	63

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.pojo.PreEugenicsBaseModel;
4	4
5	5	import java.util.List;
	6	+import java.util.Map;
6	7
7	8
8	9	public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
...	...	@@ -101,6 +102,16 @@
101	102
102	103	//隆化-结果建议，异常项建议
103	104	List<String> abnormityProposal;
	105	+ //隆化-服务跟踪
	106	+ private List<Map<String, Object>> lhSerivceFollow;
	107	+
	108	+ public List<Map<String, Object>> getLhSerivceFollow() {
	109	+ return lhSerivceFollow;
	110	+ }
	111	+
	112	+ public void setLhSerivceFollow(List<Map<String, Object>> lhSerivceFollow) {
	113	+ this.lhSerivceFollow = lhSerivceFollow;
	114	+ }
104	115
105	116	@Override
106	117	public List<String> getAbnormity() {

...	...	@@ -704,6 +704,26 @@
704	704	PreEugenicsBaseListResult result = new PreEugenicsBaseListResult();
705	705	if (model != null) {
706	706	result = getPreEugenicsBaseListResult(model);
	707	+
	708	+ Query query = new Query();
	709	+ query.addCriteria(Criteria.where("buildId").is(model.getId()));
	710	+ query.addCriteria(Criteria.where("yn").is(YnEnums.YES.getId()));
	711	+ List<LhServiceFollowModel> lhServiceFollowModels = mongoTemplate.find(query, LhServiceFollowModel.class);
	712	+ if (CollectionUtils.isNotEmpty(lhServiceFollowModels))
	713	+ {
	714	+ List<Map<String, Object>> lhSerivceFollow = new ArrayList<>();
	715	+
	716	+ for (LhServiceFollowModel followModel : lhServiceFollowModels)
	717	+ {
	718	+ Map<String, Object> data = new HashMap<>();
	719	+ data.put("sex",followModel.getSex());
	720	+ data.put("checkDate",DateUtil.getyyyy_MM_dd(followModel.getCheckDate()));
	721	+ data.put("id",followModel.getId());
	722	+ lhSerivceFollow.add(data);
	723	+ }
	724	+ result.setLhSerivceFollow(lhSerivceFollow);
	725	+ }
	726	+
707	727	}
708	728	BaseResponse baseResponse = new BaseResponse();
709	729	baseResponse.setObject(result);