diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java index a3cd6c0..9c379e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 孕期营养报告模版 @@ -218,12 +219,15 @@ public class PregnancyReportController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/wx/matters/getRisk") @ResponseBody public BaseResponse getWxReportByRisk(@RequestParam Integer week, - @RequestParam String riskFactorId,HttpServletRequest request){ + @RequestParam String riskFactorId, + @RequestParam String hospitalId){ BaseResponse baseResponse= new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); postpartumReportQuery.setWeek(week); + postpartumReportQuery.setHospitalId(hospitalId); postpartumReportQuery.setRiskFactorId(StringUtils.covertToList(riskFactorId, String.class)); - baseResponse.setObject(pregnancyReportMattersServiceFacade.getReportByRisk(postpartumReportQuery,getUserId(request))); + List reportByRisk = pregnancyReportMattersServiceFacade.getReportByRisk(postpartumReportQuery, null); + baseResponse.setObject(reportByRisk); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportMattersServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportMattersServiceFacade.java index ee201ab..1bd9da4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportMattersServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportMattersServiceFacade.java @@ -45,8 +45,10 @@ public class PregnancyReportMattersServiceFacade { return pregnancyReportMattersService.getPregnancyReport(id); } public List getReportByRisk(PregnancyReportMattersQuery postpartumReportQuery,Integer userId){ - String hospitalId= autoMatchFacade.getHospitalId(userId); - postpartumReportQuery.setHospitalId(hospitalId); + if (userId!=null){ + String hospitalId= autoMatchFacade.getHospitalId(userId); + postpartumReportQuery.setHospitalId(hospitalId); + } postpartumReportQuery.setYn(1); return pregnancyReportMattersService.queryPregnancyReport(postpartumReportQuery); } diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 04dfea2..e19c2dc 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -58,4 +58,4 @@ lhfy_lis_url=https://lhfy-chengde-api.healthbaby.com.cn:12356/lis/getLhLisById #redis.servers=119.90.57.26:6379:Lyms123456 # 测试环境 118.193.124.187:6379:Lyms123456 -redis_servers=118.193.124.187:6379:Lyms123456 \ No newline at end of file +redis_servers=192.168.0.15:6379:test123456 \ No newline at end of file