From c9babc64bc54a8f77ea89df6e83435c45a06f536 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Tue, 2 Jul 2024 15:42:46 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=AD=95=E6=9C=9F?=
 =?UTF-8?q?=E8=90=A5=E5=85=BB=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/controller/PregnancyReportController.java   | 5 +++--
 .../com/lyms/platform/operate/web/facade/PregnancyReportFacade.java  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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 aef2698..016b83e 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
@@ -107,13 +107,14 @@ public class PregnancyReportController extends BaseController {
     @RequestMapping(method = RequestMethod.GET, value = "/wx/getPatientReport")
     @ResponseBody
     public BaseResponse getWxPatientReport(@RequestParam String rFactor,
-                                         @RequestParam Integer week,
+                                           @RequestParam Integer week,
                                            @RequestParam String hospitalId
                                          ){
         PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery();
         pregnancyReportQuery.setWeek(week);
         pregnancyReportQuery.setHospitalId(hospitalId);
-        pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
+        pregnancyReportQuery.setName(rFactor);
+       // pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
         return pregnancyReportFacade.getWxPatientReport(pregnancyReportQuery);
     }
 
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 91e8480..c5de8b9 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
@@ -115,7 +115,8 @@ public class PregnancyReportFacade {
         pregnancyReportQuery.setWeek(getWeek(week));
         List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
         if (CollectionUtils.isNotEmpty(list)){
-            for (PregnancyReport pregnancyReport:list){
+            /*for (PregnancyReport pregnancyReport:list){*/
+                PregnancyReport pregnancyReport= list.get(0);
                 PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
                 postpartumReportQuery.setYn(1);
                 postpartumReportQuery.setHospitalId(hospitalId);
@@ -129,7 +130,7 @@ public class PregnancyReportFacade {
                if (CollectionUtils.isNotEmpty(mattersList)){
                    pregnancyReport.setMatters(mattersList.get(0).getMatters());
                }
-            }
+            //}
         }
         BaseListResponse baseResponse=new BaseListResponse();
         baseResponse.setObject(list);
-- 
1.8.3.1