diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 81ae3e5..bf89d97 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -175,6 +175,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //诊断 private String lastDiagnose; + private List buildTypeList; + + public List getBuildTypeList() { + return buildTypeList; + } + + public void setBuildTypeList(List buildTypeList) { + this.buildTypeList = buildTypeList; + } public String getLastDiagnose() { return lastDiagnose; @@ -371,6 +380,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.orCondition(new MongoCondition[]{con1, con}); } + if(null != buildTypeList) { + MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); + MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS); + + MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN); + + condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); + } + if(null!=sex){ condition=condition.and("sex", sex, MongoOper.IS); } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 08206e3..b4f31fc 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -397,6 +397,10 @@ public class SmsServiceImpl implements SmsService{ babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); +// List buildType = new ArrayList(); +// buildType.add(1); +// buildType.add(2); +// babyQuery.setBuildTypeList(buildType); //儿童年龄满三岁就不在提供短信服务 Date birthdayMax = DateUtil.addYear(new Date(), -3); 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 47d43f4..ae44c07 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 @@ -1569,6 +1569,12 @@ public class BabyBookbuildingFacade { private List getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) { + + List buildType = new ArrayList(); + buildType.add(1); + buildType.add(2); + babyQuery.setBuildTypeList(buildType); + babyQuery.setYn(YnEnums.YES.getId()); if (isPage) { babyQuery.setNeed("true"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 0fddcdc..16f74e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -258,6 +258,11 @@ public class BabyCheckFacade { babyModelQuery.setBuildType(3); List babyModelList= babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); if(CollectionUtils.isNotEmpty(babyModelList)){ + + BabyModel babyModel = new BabyModel(); + babyModel.setEnable("1"); + babyBookbuildingService.updateBabyBuild(babyModel,babyModelList.get(0).getId()); + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(request.getBuildId()); String hospital =babyModelList.get(0).getHospitalId();