From 555bc9521df984162cd2fedad80fb7d3cf7fdd7e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 1 Sep 2021 16:44:52 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyBookbuildingFacade.java | 4 ++-- .../platform/operate/web/facade/MatDeliverFacade.java | 2 ++ .../operate/web/result/BabyManageListResult.java | 11 +++++++++++ .../lyms/platform/operate/web/utils/BabyListTask.java | 19 ++++++++++++++++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e790187..08b123a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2774,14 +2774,14 @@ public class BabyBookbuildingFacade { basicConfigService, organizationService, babyCheckFacade, - ms, request.getIsArea(), hospitalName, usersService); + ms, request.getIsArea(), hospitalName, usersService,babyCheckService); Future f = commonThreadPool.submit(c); futures.add(f); } if (CollectionUtils.isNotEmpty(futures)) { for (Future f : futures) { try { - list.addAll((List ) f. get()); + list.addAll((List ) f.get()); } catch (Exception e) { ExceptionUtils.catchException(e, "baby list error."); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 885280d..617c7bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2877,6 +2877,7 @@ public class MatDeliverFacade { public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest, Integer userId) { NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult(); BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setExistSource(false); //babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setQueryNo(StringUtils.isEmpty(newBabyManagerRequest.getQueryNo()) ? null : newBabyManagerRequest.getQueryNo()); if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) { @@ -2926,6 +2927,7 @@ public class MatDeliverFacade { if (null != newBabyManagerRequest.getAsphyxiaMEnd()) { babyModelQuery.setAsphyxiaMEnd(newBabyManagerRequest.getAsphyxiaMEnd()); } + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index db75857..45958bc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -32,6 +32,9 @@ public class BabyManageListResult { //下次儿保时间 private String nextDate; + //最后一次检查的下次预约时间 + private String lastNextDate; + //服务状态 private String serviceStatus; @@ -84,6 +87,14 @@ public class BabyManageListResult { private String lastCheckDoctor; private String riskCode; + public String getLastNextDate() { + return lastNextDate; + } + + public void setLastNextDate(String lastNextDate) { + this.lastNextDate = lastNextDate; + } + public String getRiskCode() { return riskCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index 4a1119c..9d61be4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -1,9 +1,11 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.SexEnum; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.BabyCheckFacade; @@ -12,8 +14,10 @@ import com.lyms.platform.operate.web.result.BabyManageListResult; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.query.BabyCheckModelQuery; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; @@ -40,6 +44,8 @@ public class BabyListTask implements Callable { private BasicConfigFacade basicConfigFacade; + private BabyCheckService babyCheckService; + public BabyListTask( BasicConfigFacade basicConfigFacade, BasicConfigService basicConfigService, @@ -48,7 +54,8 @@ public class BabyListTask implements Callable { List models, String isArea, String hospitalName, - UsersService usersService) { + UsersService usersService, + BabyCheckService babyCheckService) { this.basicConfigFacade = basicConfigFacade; this.basicConfigService = basicConfigService; this.organizationService = organizationService; @@ -57,6 +64,7 @@ public class BabyListTask implements Callable { this.isArea = isArea; this.hospitalName = hospitalName; this.usersService = usersService; + this.babyCheckService = babyCheckService; } @@ -134,6 +142,15 @@ public class BabyListTask implements Callable { result.setMcertNo(model.getMcertNo()); result.setMcertTypeId(model.getMcertTypeId()); + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setBuildId(model.getId()); + query.setYn(YnEnums.YES.getId()); + List models = babyCheckService.queryBabyCheckRecord(query); + if (CollectionUtils.isNotEmpty(models)) + { + BabyCheckModel checkModel = models.get(0); + result.setLastNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate())); + } if (String.valueOf("true").equals(isArea)) { result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName()); -- 1.8.3.1