From 710e19d947afe8e59339e59b6f519986cee471a2 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 2 Jul 2024 15:58:15 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E5=AD=95=E6=9C=9F=E8=90=A5=E5=85=BB?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8F=8A=E6=82=A3=E8=80=85=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=91=8A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PregnancyReportController.java | 5 +++-- .../operate/web/facade/PregnancyReportFacade.java | 22 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 6 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 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 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 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 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); -- 1.8.3.1