diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java index a74867f..29ad48c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -331,7 +330,7 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN } else { c = Criteria.where("month").lte(monthEnd); } - }*/ + } if (null != monthStart && null != monthEnd) { Date currentDate = DateUtil.formatDate(new Date()); Date start = DateUtil.addMonth(currentDate, -monthStart); @@ -339,7 +338,7 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1); setBirthStart(end); - } + }*/ // 预约检查时间 diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java index f0f6292..d435f2f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -274,7 +273,7 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv } else { c = Criteria.where("month").lte(monthEnd); } - }*/ + } if (null != monthStart && null != monthEnd) { Date currentDate = DateUtil.formatDate(new Date()); Date start = DateUtil.addMonth(currentDate, -monthStart); @@ -282,7 +281,7 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1); setBirthStart(end); - } + }*/ // 预约检查时间 diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java index bb40341..d1bc986 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -238,7 +237,7 @@ public class BabyPsychologistModelQuery extends BaseQuery implements IConvertToN } else { c = Criteria.where("month").lte(monthEnd); } - }*/ + } if (null != monthStart && null != monthEnd) { Date currentDate = DateUtil.formatDate(new Date()); Date start = DateUtil.addMonth(currentDate, -monthStart); @@ -247,7 +246,7 @@ public class BabyPsychologistModelQuery extends BaseQuery implements IConvertToN Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1); setBirthStart(end); } - +*/ // 预约检查时间 if (null != nextDateStart) { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java index af936ea..f50f652 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -262,7 +261,7 @@ public class BabySpecialDiseaseClinicModelQuery extends BaseQuery implements ICo } else { c = Criteria.where("month").lte(monthEnd); } - }*/ + } if (null != monthStart && null != monthEnd) { Date currentDate = DateUtil.formatDate(new Date()); Date start = DateUtil.addMonth(currentDate, -monthStart); @@ -270,7 +269,7 @@ public class BabySpecialDiseaseClinicModelQuery extends BaseQuery implements ICo Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1); setBirthStart(end); - } + }*/ // 预约检查时间 diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyStuntingQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyStuntingQuery.java index 61012a6..f447901 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyStuntingQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyStuntingQuery.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -238,7 +237,7 @@ public class BabyStuntingQuery extends BaseQuery implements IConvertToNativeQuer } else { c = Criteria.where("month").lte(monthEnd); } - }*/ + } if (null != monthStart && null != monthEnd) { Date currentDate = DateUtil.formatDate(new Date()); Date start = DateUtil.addMonth(currentDate, -monthStart); @@ -246,7 +245,7 @@ public class BabyStuntingQuery extends BaseQuery implements IConvertToNativeQuer Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1); setBirthStart(end); - } + }*/ // 预约检查时间 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index f00eafa..223332d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -362,13 +362,38 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { if (babyQuery.getNextDateEnd() != null) { babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd())); } - if (babyQuery.getBirthEnd() != null) { - babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); - } + if (babyQuery.getcCDateEnd() != null) { babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd())); } + Date currentDate = DateUtil.formatDate(new Date()); + //月龄和生日都有 + if ((babyQuery.getBirthStart() != null && babyQuery.getBirthEnd() != null) && (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd())) { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + if (babyQuery.getBirthStart().getTime() < end.getTime()) { + babyQuery.setBirthStart(end); + } else { + babyQuery.setBirthStart(babyQuery.getBirthStart()); + } + + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + if (babyQuery.getBirthEnd().getTime() < start.getTime()) { + babyQuery.setBirthEnd(babyQuery.getBirthEnd()); + } else { + babyQuery.setBirthEnd(start); + } + + } else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) { + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + babyQuery.setBirthStart(end); + } + if (babyQuery.getBirthEnd() != null) { + babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); + } + babyHighRiskBabyModelList = babyHighRiskBabyService.queryAll(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java index 9677ee6..68ff30e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java @@ -388,13 +388,39 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { if (babyQuery.getNextDateEnd() != null) { babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd())); } - if (babyQuery.getBirthEnd() != null) { - babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); - } + if (babyQuery.getcCDateEnd() != null) { babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd())); } + Date currentDate = DateUtil.formatDate(new Date()); + //月龄和生日都有 + if ((babyQuery.getBirthStart() != null && babyQuery.getBirthEnd() != null) && (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd())) { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + if (babyQuery.getBirthStart().getTime() < end.getTime()) { + babyQuery.setBirthStart(end); + } else { + babyQuery.setBirthStart(babyQuery.getBirthStart()); + } + + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + if (babyQuery.getBirthEnd().getTime() < start.getTime()) { + babyQuery.setBirthEnd(babyQuery.getBirthEnd()); + } else { + babyQuery.setBirthEnd(start); + } + + } else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) { + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + babyQuery.setBirthStart(end); + } + if (babyQuery.getBirthEnd() != null) { + babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); + } + + babyNutritionSpecialtyModelList = babyBabyNSService.queryAll(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java index b472f7b..0d647a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java @@ -152,20 +152,18 @@ public class BabyPsychologistFacade extends BaseServiceImpl { model.setHandlingOpinions(request.getHandlingOpinions()); - - return model; } - /** - * 新增 心理专科检查 - * - * @param request - * @param userId - * @Author: 武涛涛 - * @Date: 2020/8/12 17:15 - */ + /** + * 新增 心理专科检查 + * + * @param request + * @param userId + * @Author: 武涛涛 + * @Date: 2020/8/12 17:15 + */ public BaseResponse addBabyPsychologist(BabyPsychologistRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -181,11 +179,11 @@ public class BabyPsychologistFacade extends BaseServiceImpl { model.setCreateDate(new Date()); model.setHospitalId(hospitalId); model = babyPsychologistService.addBabyPsychologist(model); - if (model!=null && model.getId()!=null) { + if (model != null && model.getId() != null) { operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "新增心理专科检查"); try { //添加检查后更新转诊接受状态 - babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(),hospitalId,"xlzk"); + babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(), hospitalId, "xlzk"); } catch (Exception e) { e.printStackTrace(); } @@ -205,13 +203,13 @@ public class BabyPsychologistFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2020/7/31 11:02 */ - public BaseResponse updateBabyPsychologist (BabyPsychologistRequest request, Integer userId) { + public BaseResponse updateBabyPsychologist(BabyPsychologistRequest request, Integer userId) { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(userId); BabyPsychologistModel model = getBabyPsychologistModel(request); BabyPsychologistModel models = babyPsychologistService.queryBabyPsychologistById(request.getId()); - if (models !=null && models.getId()!=null) { + if (models != null && models.getId() != null) { babyPsychologistService.updateBabyPsychologist(model, request.getId()); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "修改心理专科检查"); } @@ -229,8 +227,8 @@ public class BabyPsychologistFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); //查询儿童的检查记录 - BabyPsychologistModel checkModel = babyPsychologistService.queryBabyPsychologistById(id); - if(checkModel !=null && checkModel.getId()!= null){ + BabyPsychologistModel checkModel = babyPsychologistService.queryBabyPsychologistById(id); + if (checkModel != null && checkModel.getId() != null) { babyPsychologistService.deleteBabySpecialDiseaseClinicById(id); operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), checkModel, OptActionEnums.DELETE.getId(), "删除心理专科检查"); @@ -247,20 +245,20 @@ public class BabyPsychologistFacade extends BaseServiceImpl { public BaseObjectResponse queryBabyPsychologistShow(String id) { BaseObjectResponse br = new BaseObjectResponse(); - if(StringUtils.isNotEmpty(id)){ + if (StringUtils.isNotEmpty(id)) { BabyPsychologistModel babyPsychologistModel = babyPsychologistService.queryBabyPsychologistById(id); BabyPsychologistResult babyPsychologistResult = new BabyPsychologistResult(); babyPsychologistResult.convertToResult(babyPsychologistModel); - if(CollectionUtils.isNotEmpty(babyPsychologistModel.getmHighRiskReason())){ + if (CollectionUtils.isNotEmpty(babyPsychologistModel.getmHighRiskReason())) { babyPsychologistResult.setmHighRiskReason(mongoUtil.findColor(babyPsychologistModel.getmHighRiskReason())); } - if(StringUtils.isNotEmpty(babyPsychologistModel.getCheckDoctor())){ + if (StringUtils.isNotEmpty(babyPsychologistModel.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(babyPsychologistModel.getCheckDoctor())); - if(users!=null && StringUtils.isNotEmpty(users.getName())){ + if (users != null && StringUtils.isNotEmpty(users.getName())) { babyPsychologistResult.setCheckDoctor(users.getName()); } } - if(StringUtils.isNotEmpty(babyPsychologistModel.getHospitalId())){ + if (StringUtils.isNotEmpty(babyPsychologistModel.getHospitalId())) { babyPsychologistResult.setHospitalName(CommonsHelper.getHospitalName(babyPsychologistModel.getHospitalId(), organizationService)); } br.setData(babyPsychologistResult); @@ -279,7 +277,7 @@ public class BabyPsychologistFacade extends BaseServiceImpl { public BaseObjectResponse queryBabyPsychologistEdit(String id) { BaseObjectResponse br = new BaseObjectResponse(); - if(StringUtils.isNotEmpty(id)){ + if (StringUtils.isNotEmpty(id)) { BabyPsychologistModel babyPsychologistModel = babyPsychologistService.queryBabyPsychologistById(id); BabyPsychologistResult babyPsychologistResult = new BabyPsychologistResult(); babyPsychologistResult.convertToResult(babyPsychologistModel); @@ -303,10 +301,10 @@ public class BabyPsychologistFacade extends BaseServiceImpl { BaseObjectResponse br = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); - List babyPsychologistResultList = new ArrayList<>(); + List babyPsychologistResultList = new ArrayList <>(); //单人多条专病记录 - List babyPsychologistModels = new ArrayList<>(); - if( StringUtils.isNotEmpty(babyQuery.getBuildId()) ){ + List babyPsychologistModels = new ArrayList <>(); + if (StringUtils.isNotEmpty(babyQuery.getBuildId())) { babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); babyQuery.setSort("ASC"); @@ -316,9 +314,9 @@ public class BabyPsychologistFacade extends BaseServiceImpl { for (int i = 0; i < babyPsychologistModels.size(); i++) { BabyPsychologistModel babyPsychologistModel = babyPsychologistModels.get(i); BabyPsychologistResult babyPsychologistResult = new BabyPsychologistResult(); - if(babyPsychologistModel !=null ){ + if (babyPsychologistModel != null) { babyPsychologistResult.convertToResult(babyPsychologistModel); - if(StringUtils.isNotEmpty(babyPsychologistModel.getHospitalId())){ + if (StringUtils.isNotEmpty(babyPsychologistModel.getHospitalId())) { babyPsychologistResult.setHospitalName(CommonsHelper.getHospitalName(babyPsychologistModel.getHospitalId(), organizationService)); } babyPsychologistResultList.add(babyPsychologistResult); @@ -343,31 +341,57 @@ public class BabyPsychologistFacade extends BaseServiceImpl { BaseObjectResponse br = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); - List babyPsychologistResultList = new ArrayList<>(); + List babyPsychologistResultList = new ArrayList <>(); //单人多条专病记录 - List babyPsychologistModelList = new ArrayList<>(); - if(StringUtils.isEmpty(babyQuery.getBuildId()) ){ + List babyPsychologistModelList = new ArrayList <>(); + if (StringUtils.isEmpty(babyQuery.getBuildId())) { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); babyQuery.setSort(null); - if(babyQuery.getCheckDateEnd()!=null){ + if (babyQuery.getCheckDateEnd() != null) { babyQuery.setCheckDateEnd(DateUtil.getDayLastSecond(babyQuery.getCheckDateEnd())); } - if(babyQuery.getNextDateEnd()!=null){ + if (babyQuery.getNextDateEnd() != null) { babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd())); } - if(babyQuery.getBirthEnd()!=null){ + + Date currentDate = DateUtil.formatDate(new Date()); + //月龄和生日都有 + if ((babyQuery.getBirthStart() != null && babyQuery.getBirthEnd() != null) && (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd())) { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + if (babyQuery.getBirthStart().getTime() < end.getTime()) { + babyQuery.setBirthStart(end); + } else { + babyQuery.setBirthStart(babyQuery.getBirthStart()); + } + + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + if (babyQuery.getBirthEnd().getTime() < start.getTime()) { + babyQuery.setBirthEnd(babyQuery.getBirthEnd()); + } else { + babyQuery.setBirthEnd(start); + } + + } else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) { + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + babyQuery.setBirthStart(end); + } + if (babyQuery.getBirthEnd() != null) { babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); } - babyPsychologistModelList = babyPsychologistService.queryBabyPsychologistListAll(babyQuery); + + + babyPsychologistModelList = babyPsychologistService.queryBabyPsychologistListAll(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } for (int i = 0; i < babyPsychologistModelList.size(); i++) { BabyPsychologistModel babyPsychologistModel = babyPsychologistModelList.get(i); BabyPsychologistResult babyPsychologistResult = new BabyPsychologistResult(); - if(babyPsychologistModel !=null ){ + if (babyPsychologistModel != null) { babyPsychologistResult.convertToResult(babyPsychologistModel); babyPsychologistResult.setHospitalId(CommonsHelper.getHospitalName(babyPsychologistModel.getHospitalId(), organizationService)); babyPsychologistResultList.add(babyPsychologistResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java index 6bc2143..5e98a1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java @@ -278,9 +278,35 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { if(babyQuery.getNextDateEnd()!=null){ babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd())); } - if(babyQuery.getBirthEnd()!=null){ + + Date currentDate = DateUtil.formatDate(new Date()); + //月龄和生日都有 + if ((babyQuery.getBirthStart() != null && babyQuery.getBirthEnd() != null) && (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd())) { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + if (babyQuery.getBirthStart().getTime() < end.getTime()) { + babyQuery.setBirthStart(end); + } else { + babyQuery.setBirthStart(babyQuery.getBirthStart()); + } + + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + if (babyQuery.getBirthEnd().getTime() < start.getTime()) { + babyQuery.setBirthEnd(babyQuery.getBirthEnd()); + } else { + babyQuery.setBirthEnd(start); + } + + } else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) { + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + babyQuery.setBirthStart(end); + } + if (babyQuery.getBirthEnd() != null) { babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); } + + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java index 7b0fc0e..cf87c98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java @@ -92,12 +92,7 @@ public class BabyStuntingFacade extends BaseServiceImpl { model.setNextDate(DateUtil.parseYMD(request.getNextDate())); model.setCzOrfzProject(request.getCzOrfzProject()); - if (StringUtils.isNotEmpty(request.getCzOrfzProject())) { - if ("cz".equals(request.getCzOrfzProject())) { - model.setBlbh(request.getBlbh()); - } - } - + model.setBlbh(request.getBlbh()); model.setCzDate(DateUtil.parseYMD(request.getCzDate())); model.setAddr(request.getAddr()); @@ -319,7 +314,7 @@ public class BabyStuntingFacade extends BaseServiceImpl { BabyStuntingModel babyNutritionSpecialtyModel = babyStuntingModelList.get(i); BabyStuntingResult babyStuntingResult = new BabyStuntingResult(); if (babyNutritionSpecialtyModel != null) { - if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getBlbh())) { + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getBlbh()) && "cz".equals(babyNutritionSpecialtyModel.getCzOrfzProject())) { blbh = babyNutritionSpecialtyModel.getBlbh(); } if(babyQuery!=null && babyQuery.isType() && "cz".equals(babyNutritionSpecialtyModel.getCzOrfzProject())){ @@ -371,6 +366,29 @@ public class BabyStuntingFacade extends BaseServiceImpl { if (babyQuery.getNextDateEnd() != null) { babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd())); } + Date currentDate = DateUtil.formatDate(new Date()); + //月龄和生日都有 + if ((babyQuery.getBirthStart() != null && babyQuery.getBirthEnd() != null) && (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd())) { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + if (babyQuery.getBirthStart().getTime() < end.getTime()) { + babyQuery.setBirthStart(end); + } else { + babyQuery.setBirthStart(babyQuery.getBirthStart()); + } + + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + if (babyQuery.getBirthEnd().getTime() < start.getTime()) { + babyQuery.setBirthEnd(babyQuery.getBirthEnd()); + } else { + babyQuery.setBirthEnd(start); + } + + } else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) { + Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart()); + babyQuery.setBirthEnd(start); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); + babyQuery.setBirthStart(end); + } if (babyQuery.getBirthEnd() != null) { babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); }