diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java index 527c45c..7678e44 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java @@ -41,7 +41,7 @@ public class FolicAcidController { //获取单个发放记录 @RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET) @ResponseBody - @TokenRequired +// @TokenRequired public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest, HttpServletRequest request) { @@ -51,7 +51,7 @@ public class FolicAcidController { //叶酸发放管理 @RequestMapping(value = "/queryFolicAcid", method = RequestMethod.GET) @ResponseBody - @TokenRequired +// @TokenRequired public BaseListResponse queryFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest, HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 0eb9e72..311d25e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -87,7 +87,7 @@ public class FolicAcidFacade { if (StringUtils.isNotEmpty(queryRequest.getId())){ folicAcid = folicAcidService.getFolicAcid(queryRequest.getId()); if (folicAcid!=null && folicAcid.getYn()== YnEnums.YES.getId() && folicAcid.getParentId()!=null){ - archiveModel = residentsArchiveService.getResident(folicAcid.getId()); + archiveModel = residentsArchiveService.getResident(folicAcid.getParentId()); } }else { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); @@ -108,8 +108,8 @@ public class FolicAcidFacade { } } - //妇女信息 if (archiveModel!=null){ + //妇女信息 archiveMap = new HashMap<>(); archiveMap.put("certificateNum", archiveModel.getCertificateNum()); archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); @@ -117,6 +117,7 @@ public class FolicAcidFacade { archiveMap.put("birthday",archiveModel.getBirthday()); archiveMap.put("age", archiveModel.getAge()); archiveMap.put("phone", archiveModel.getPhone()); + } resultMap.put("folicAcidResult",folicAcid); resultMap.put("archiveResult",archiveMap);