From e5c1a6e2c5e83aff249c6d0cda50ff8afadc447e Mon Sep 17 00:00:00 2001 From: zhangchao Date: Sun, 7 Jul 2024 16:44:32 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PregnancyReportFacade.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 8d2d7b1..31feed7 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 @@ -6,10 +6,12 @@ import com.lyms.platform.biz.service.PregnancyReportService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.PregnancyReport; import com.lyms.platform.pojo.PregnancyReportMatters; +import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PregnancyReportMattersQuery; import com.lyms.platform.query.PregnancyReportQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -148,13 +150,19 @@ public class PregnancyReportFacade { public BaseResponse getWxPatientReport(PregnancyReportQuery pregnancyReportQuery){ pregnancyReportQuery.setYn(1); BaseResponse baseResponse=new BaseResponse(); - BasicConfig basicConfig= basicConfigService.getOneBasicConfigById(pregnancyReportQuery.getName()); - if (basicConfig==null){ + BasicConfigQuery basicConfigQuery=new BasicConfigQuery(); + basicConfigQuery.setIds(StringUtils.covertToList(pregnancyReportQuery.getName(), String.class)); + List basicConfig= basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isEmpty(basicConfig)){ baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); baseResponse.setErrormsg("模版异常"); } + StringBuffer sb=new StringBuffer(); + for(BasicConfig basicConfig1:basicConfig){ + sb.append(basicConfig1.getName()).append(","); + } Integer week= pregnancyReportQuery.getWeek(); - pregnancyReportQuery.setName(getReportName(basicConfig.getName(),getWeek(week),pregnancyReportQuery.getWeightType())); + pregnancyReportQuery.setName(getReportName(sb.toString(),getWeek(week),pregnancyReportQuery.getWeightType())); pregnancyReportQuery.setWeek(getWeek(week)); List list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery); if (CollectionUtils.isNotEmpty(list)){ -- 1.8.3.1