shiyang / regional-platform

Authored by landong2015 over 8 years ago

Showing 2 changed files with 5 additions and 4 deletions

...	...	@@ -41,7 +41,7 @@
41	41	//获取单个发放记录
42	42	@RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET)
43	43	@ResponseBody
44		- @TokenRequired
	44	+// @TokenRequired
45	45	public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
46	46	HttpServletRequest request) {
47	47
...	...	@@ -51,7 +51,7 @@
51	51	//叶酸发放管理
52	52	@RequestMapping(value = "/queryFolicAcid", method = RequestMethod.GET)
53	53	@ResponseBody
54		- @TokenRequired
	54	+// @TokenRequired
55	55	public BaseListResponse queryFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
56	56	HttpServletRequest request) {
57	57

...	...	@@ -87,7 +87,7 @@
87	87	if (StringUtils.isNotEmpty(queryRequest.getId())){
88	88	folicAcid = folicAcidService.getFolicAcid(queryRequest.getId());
89	89	if (folicAcid!=null && folicAcid.getYn()== YnEnums.YES.getId() && folicAcid.getParentId()!=null){
90		- archiveModel = residentsArchiveService.getResident(folicAcid.getId());
	90	+ archiveModel = residentsArchiveService.getResident(folicAcid.getParentId());
91	91	}
92	92	}else {
93	93	ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
94	94
...	...	@@ -108,8 +108,8 @@
108	108	}
109	109	}
110	110
111		- //妇女信息
112	111	if (archiveModel!=null){
	112	+ //妇女信息
113	113	archiveMap = new HashMap<>();
114	114	archiveMap.put("certificateNum", archiveModel.getCertificateNum());
115	115	archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
...	...	@@ -117,6 +117,7 @@
117	117	archiveMap.put("birthday",archiveModel.getBirthday());
118	118	archiveMap.put("age", archiveModel.getAge());
119	119	archiveMap.put("phone", archiveModel.getPhone());
	120	+
120	121	}
121	122	resultMap.put("folicAcidResult",folicAcid);
122	123	resultMap.put("archiveResult",archiveMap);