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 016b83e..20ba086 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
@@ -77,14 +77,15 @@ public class PregnancyReportController extends BaseController {
     @RequestMapping(method = RequestMethod.GET, value = "/getPatientReport")
     @ResponseBody
     @TokenRequired
-    public BaseResponse getPatientReport(@RequestParam(required = false) String rFactor,
+    public BaseResponse getPatientReport(@RequestParam(required = false) String name,
                                 @RequestParam(required = false) Integer week,
                                 @RequestParam(required = false) Integer weightType,
                                          HttpServletRequest request){
         PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery();
         pregnancyReportQuery.setWeek(week);
         pregnancyReportQuery.setWeightType(weightType);
-        pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
+        pregnancyReportQuery.setName(name);
+        //pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
         return pregnancyReportFacade.getPatientReport(pregnancyReportQuery,getUserId(request));
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java
index c5de8b9..def6ab6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java
@@ -69,7 +69,21 @@ public class PregnancyReportFacade {
         List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
         BaseResponse baseResponse=new BaseResponse();
         if (CollectionUtils.isNotEmpty(list)){
-            baseResponse.setObject(list);
+            PregnancyReport pregnancyReport= list.get(0);
+            PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
+            postpartumReportQuery.setYn(1);
+            postpartumReportQuery.setHospitalId(pregnancyReportQuery.getHospitalId());
+            postpartumReportQuery.setWeek(week);
+            Integer riskType=1;
+            if (pregnancyReport.getRiskFactorName().contains("健康")){
+                riskType=0;
+            }
+            postpartumReportQuery.setRiskType(riskType);
+            List<PregnancyReportMatters> mattersList= pregnancyReportMattersService.queryPregnancyReport(postpartumReportQuery);
+            if (CollectionUtils.isNotEmpty(mattersList)){
+                pregnancyReport.setMatters(mattersList.get(0).getMatters());
+            }
+            baseResponse.setObject(pregnancyReport);
         }
         baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         baseResponse.setErrormsg("成功");
@@ -115,8 +129,8 @@ public class PregnancyReportFacade {
         pregnancyReportQuery.setWeek(getWeek(week));
         List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
         if (CollectionUtils.isNotEmpty(list)){
-            /*for (PregnancyReport pregnancyReport:list){*/
-                PregnancyReport pregnancyReport= list.get(0);
+            for (PregnancyReport pregnancyReport:list){
+                //PregnancyReport pregnancyReport= list.get(0);
                 PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
                 postpartumReportQuery.setYn(1);
                 postpartumReportQuery.setHospitalId(hospitalId);
@@ -130,7 +144,7 @@ public class PregnancyReportFacade {
                if (CollectionUtils.isNotEmpty(mattersList)){
                    pregnancyReport.setMatters(mattersList.get(0).getMatters());
                }
-            //}
+            }
         }
         BaseListResponse baseResponse=new BaseListResponse();
         baseResponse.setObject(list);