diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index e09f333..64ac59c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -836,7 +836,9 @@ public class DateUtil { // Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1); // System.out.println(getyyyy_MM_dd(startDate)); - int a = daysBetween(parseYMD("2016-10-01"),new Date())/7; + + int a = getBabyAgeMonth(parseYMD("2012-10-01"),parseYMD("2016-10-01")); +// int a = daysBetween(parseYMD("2016-10-01"),new Date())/7; System.out.println(a); // Date dueDate = DateUtil.addDay(DateUtil.addMonth(parseYMD("2016-02-08"), 9), 7); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 0870d34..e8edfd3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -234,6 +234,17 @@ public class BabyCheckModel extends BaseModel { private Date birth; + //检查月龄 + private Integer checkMonth; + + public Integer getCheckMonth() { + return checkMonth; + } + + public void setCheckMonth(Integer checkMonth) { + this.checkMonth = checkMonth; + } + public Date getBirth() { return birth; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index 56f79d5..afeb168 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -54,6 +54,9 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu private Date checkDateStart; private Date checkDateEnd; + private Integer checkMonthStart; + private Integer checkMonthEnd; + @Override @@ -121,6 +124,23 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu } } + if (null != checkMonthStart) { + if (null != c) { + c = c.and("checkMonth").gte(checkMonthStart); + } else { + c = Criteria.where("checkMonth").gte(checkMonthStart); + } + } + + if (null != checkMonthEnd) { + if (null != c) { + c = c.lte(checkMonthEnd); + } else { + c = Criteria.where("checkMonth").lte(checkMonthEnd); + } + } + + if (c != null) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } @@ -128,6 +148,22 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu return condition.toMongoQuery(); } + public Integer getCheckMonthStart() { + return checkMonthStart; + } + + public void setCheckMonthStart(Integer checkMonthStart) { + this.checkMonthStart = checkMonthStart; + } + + public Integer getCheckMonthEnd() { + return checkMonthEnd; + } + + public void setCheckMonthEnd(Integer checkMonthEnd) { + this.checkMonthEnd = checkMonthEnd; + } + public String getHospitalId() { return hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index fb1ab9c..348279f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -1,15 +1,13 @@ package com.lyms.platform.operate.web; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.MongoConvertHelper; -import com.lyms.platform.common.utils.ReflectionUtils; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.BabyCheckModelQuery; import com.lyms.platform.query.PatientsQuery; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -26,7 +24,7 @@ import java.util.List; public class Test { public static void main(String[] args) { - PatientsQuery patientsQuery1 = new PatientsQuery(); +// PatientsQuery patientsQuery1 = new PatientsQuery(); // patientsQuery1.setHospitalId("221"); // patientsQuery1.setYn(YnEnums.YES.getId()); // patientsQuery1.setType(1); @@ -62,31 +60,31 @@ public class Test { // patientsQuery1.setType(1); // - patientsQuery1.setYn(YnEnums.YES.getId()); - patientsQuery1.setType(1); - -// Date end = DateUtil.addDay(new Date(), 0); - - Date start = DateUtil.addDay(new Date(), -100); - - - patientsQuery1.setLastMensesStart(start); -// patientsQuery1.setLastMensesEnd(end); - - - Date date1 = DateUtil.addYear(new Date(), -18); -// patientsQuery1.setBirthEnd(date1); - Date date2 = DateUtil.addYear(new Date(), -30); - date2 = DateUtil.addYear(date2, -1); - - patientsQuery1.setBirthStart(DateUtil.addDay(date2, 1)); - List buildType = new ArrayList(); - buildType.add(0); - buildType.add(2); - patientsQuery1.setBuildTypeList(buildType); - - - System.out.println(patientsQuery1.convertToQuery().convertToMongoQuery()); +// patientsQuery1.setYn(YnEnums.YES.getId()); +// patientsQuery1.setType(1); +// +//// Date end = DateUtil.addDay(new Date(), 0); +// +// Date start = DateUtil.addDay(new Date(), -100); +// +// +// patientsQuery1.setLastMensesStart(start); +//// patientsQuery1.setLastMensesEnd(end); +// +// +// Date date1 = DateUtil.addYear(new Date(), -18); +//// patientsQuery1.setBirthEnd(date1); +// Date date2 = DateUtil.addYear(new Date(), -30); +// date2 = DateUtil.addYear(date2, -1); +// +// patientsQuery1.setBirthStart(DateUtil.addDay(date2, 1)); +// List buildType = new ArrayList(); +// buildType.add(0); +// buildType.add(2); +// patientsQuery1.setBuildTypeList(buildType); +// +// +// System.out.println(patientsQuery1.convertToQuery().convertToMongoQuery()); /* @@ -215,5 +213,37 @@ public class Test { */ + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery(); + babyQuery.setHospitalId("216"); + + babyQuery.setYn(YnEnums.YES.getId()); + Date currentDate = DateUtil.formatDate(new Date()); + +// String birth="2016-02-01 - 2016-05-01"; + Integer monthAgeStart = 1; + Integer monthAgeEnd = 1; + +// if (StringUtils.isNotEmpty(birth)) +// { +// String birthStr = birth; +// String[] dates = birthStr.split(" - "); +// babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); +// babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); +// } + if (monthAgeStart != null) + { + Date start = DateUtil.addMonth(currentDate, -monthAgeStart); + babyQuery.setCheckDateEnd(start); + } + if (monthAgeEnd != null) + { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthAgeEnd - 1), 1); + babyQuery.setCheckDateStart(end); + } + + + System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); + + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 99e0cde..722325b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -796,6 +796,8 @@ public class TestController { } checkModel.setHospitalId(checkModel.getHospitalId()); checkModel.setBirth(babyModel.getBirth()); + + checkModel.setCheckMonth(DateUtil.getBabyAgeMonth(babyModel.getBirth(), checkModel.getCheckDate())); babyCheckService.updateBabyCheck(checkModel,checkModel.getId()); } } 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 9620118..ea8fb61 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 @@ -2215,7 +2215,6 @@ public class BabyBookbuildingFacade { babyQuery.setHospitalId(hospitalId); babyQuery.setYn(YnEnums.YES.getId()); - Date currentDate = DateUtil.formatDate(new Date()); if (StringUtils.isNotEmpty(request.getBirth())) { @@ -2226,13 +2225,11 @@ public class BabyBookbuildingFacade { } if (request.getMonthAgeStart() != null) { - Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); - babyQuery.setCheckDateEnd(start); + babyQuery.setCheckMonthStart(request.getMonthAgeStart()); } if (request.getMonthAgeEnd() != null) { - Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1); - babyQuery.setCheckDateStart(end); + babyQuery.setCheckMonthEnd(request.getMonthAgeEnd()); } babyQuery.setPage(page); @@ -2283,7 +2280,7 @@ public class BabyBookbuildingFacade { map.put("height",checkModel.getHeight()); //身长 map.put("weight", checkModel.getWeight()); //体重 StringBuffer sb = new StringBuffer(); - if (StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()) && "[null]".equals(checkModel.getGrowthEvaluate())) + if (StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()) && "[\"null\"]".equals(checkModel.getGrowthEvaluate())) { List items = JsonUtil.toList(checkModel.getGrowthEvaluate(),String.class); if (CollectionUtils.isNotEmpty(items)) 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 2024752..723eb8a 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 @@ -189,6 +189,17 @@ public class BabyCheckFacade { model.setHeadEvaluate(request.getHeadEvaluate()); model.setHeightEvaluate(request.getHeightEvaluate()); + if (StringUtils.isNotEmpty(request.getBuildId())) + { + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setId(request.getBuildId()); + babyModelQuery.setYn(YnEnums.YES.getId()); + List babyModelList= babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if(CollectionUtils.isNotEmpty(babyModelList)){ + model.setCheckMonth(DateUtil.getBabyAgeMonth(babyModelList.get(0).getBirth(),DateUtil.parseYMD(request.getCheckDate()))); + } + } + return model; }