From e9091b636b48f124758530e3c6a8e072ad1dba44 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 2 Jul 2024 17:49:11 +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=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/PregnancyReportQuery.java | 2 +- .../platform/operate/web/facade/PregnancyReportFacade.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java index d4b2f4c..a876e06 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java @@ -106,7 +106,7 @@ public class PregnancyReportQuery extends BaseQuery implements IConvertToNativeQ condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); } if (StringUtils.isNotEmpty(name)){ - condition=condition.and("name",name,MongoOper.IS); + condition=condition.and("name",name,MongoOper.LIKE); } if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); 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 b539e96..6efb329 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 @@ -127,7 +127,7 @@ public class PregnancyReportFacade { postpartumReportQuery.setHospitalId(pregnancyReportQuery.getHospitalId()); postpartumReportQuery.setWeek(week); Integer riskType=1; - if (pregnancyReport.getRiskFactorName().contains("健康")){ + if (pregnancyReport.getName().contains("健康")){ riskType=0; } postpartumReportQuery.setRiskType(riskType); @@ -149,9 +149,12 @@ public class PregnancyReportFacade { pregnancyReportQuery.setYn(1); pregnancyReportQuery.setNeed("true"); Integer week= pregnancyReportQuery.getWeek(); - pregnancyReportQuery.setWeek(getWeek(week)); + if (week!=null){ + pregnancyReportQuery.setWeek(getWeek(week)); + } + List list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery); - if (CollectionUtils.isNotEmpty(list)){ + /* if (CollectionUtils.isNotEmpty(list)){ for (PregnancyReport pregnancyReport:list){ //PregnancyReport pregnancyReport= list.get(0); PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); @@ -168,7 +171,7 @@ public class PregnancyReportFacade { pregnancyReport.setMatters(mattersList.get(0).getMatters()); } } - } + }*/ BaseListResponse baseResponse=new BaseListResponse(); baseResponse.setObject(list); baseResponse.setPageInfo(pregnancyReportQuery.getPageInfo()); -- 1.8.3.1