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 37a4423..e6a55f8 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 @@ -41,6 +41,7 @@ public class DateUtil { } public static Integer minute2Index(Date date) { + DateTime dt = new DateTime(date.getTime()); return dt.getMinuteOfDay() / 10; } @@ -499,6 +500,58 @@ public class DateUtil { return result; } + public static int countMonths(Date date1,Date date2) throws ParseException{ + + /* Calendar c1=Calendar.getInstance(); + Calendar c2=Calendar.getInstance(); + + c1.setTime(date1); + c2.setTime(date2); + + int year =c2.get(Calendar.YEAR)-c1.get(Calendar.YEAR); + System.out.print(year); + //开始日期若小月结束日期 + if(year<0){ + year=-year; + return year*12+c1.get(Calendar.MONTH)-c2.get(Calendar.MONTH); + }*/ + +// return year*12+c2.get(Calendar.MONTH)-c1.get(Calendar.MONTH); + return 0; + + + } + public static int getBabyMonthAge1(Date birth, Date checkDate) + { + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(checkDate); + rightNow.add(Calendar.MONTH,-1); + if (birth.getTime() > rightNow.getTime().getTime()) + { + return 0; + } + Calendar rightNow1 = Calendar.getInstance(); + rightNow1.setTime(checkDate); + rightNow1.add(Calendar.YEAR,-1); + + + if (birth.getTime() > rightNow1.getTime().getTime()) + { + + int month = getMonthSpace(birth,checkDate); + Calendar yearNow = Calendar.getInstance(); + yearNow.setTime(birth); + yearNow.add(Calendar.MONTH,month); + return month; + } + int year = getYearSpace(birth, checkDate); + rightNow.setTime(checkDate); + rightNow.add(Calendar.YEAR,year); + + int month = getMonthSpace1(birth, rightNow.getTime()); + + return year*12+month; + } public static int getMonthSpace1(Date date1, Date date2) { @@ -685,9 +738,8 @@ public class DateUtil { // String st = md.format(new Date()); // System.out.print(st); - String s = getBabyMonthAge(parseYMD("2013-09-16"), new Date()); + int s = getBabyMonthAge1(parseYMD("2016-09-07"), new Date()); System.out.println(s); - // Date s = addDay(parseYMD("2016-02-26"), 168); // System.out.println(getyyyy_MM_dd(s)); } catch (Exception e) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 1225208..8b60729 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -30,6 +30,8 @@ public class ReferralApplyOrderModel { private Date birth; //申请时间(多少天) private Date dueWeek; + //月龄的月 或者 孕周的周 + private Integer days; //末次月经 private Date lastMenses; private String otherHighRisk; @@ -82,6 +84,14 @@ public class ReferralApplyOrderModel { private Integer serviceType; + public Integer getDays() { + return days; + } + + public void setDays(Integer days) { + this.days = days; + } + public Integer getpStatus() { return pStatus; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index bc2904b..0aae27b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -41,9 +41,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //年龄 private String age; //孕周 - private Date dueDateStart; + private Integer dueDateStart; //孕周 - private Date dueDateEnd; + private Integer dueDateEnd; //风险等级 private String rLevel; private Integer scoreStart; @@ -271,19 +271,19 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati this.id = id; } - public Date getDueDateEnd() { + public Integer getDueDateEnd() { return dueDateEnd; } - public void setDueDateEnd(Date dueDateEnd) { + public void setDueDateEnd(Integer dueDateEnd) { this.dueDateEnd = dueDateEnd; } - public Date getDueDateStart() { + public Integer getDueDateStart() { return dueDateStart; } - public void setDueDateStart(Date dueDateStart) { + public void setDueDateStart(Integer dueDateStart) { this.dueDateStart = dueDateStart; } @@ -408,14 +408,14 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if (null != dueDateStart) { - c = Criteria.where("dueWeek").gte(dueDateStart); + c = Criteria.where("days").gte(dueDateStart); isAddStart = Boolean.TRUE; } if (null != dueDateEnd) { if (isAddStart) { c = c.lte(dueDateEnd); } else { - c = Criteria.where("dueWeek").lte(dueDateEnd); + c = Criteria.where("days").lte(dueDateEnd); } isAddStart = Boolean.TRUE; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index a28f993..cf0b3b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -129,9 +129,11 @@ public class ApplyOrderFacade { } } referralApplyOrderModel.setrLevel(lsit); -// referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(new Date()); + days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + + referralApplyOrderModel.setDays(days/7); referralApplyOrderModel.setpStatus(2); if(null!=patients.getFmDate()){ referralApplyOrderModel.setpStatus(1); @@ -181,8 +183,8 @@ public class ApplyOrderFacade { id = babyModel.getId(); if (null != babyModel.getBirth()) { referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); -// referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date())); } + referralApplyOrderModel.setDays(DateUtil.getBabyMonthAge1(babyModel.getBirth(), new Date())); referralApplyOrderModel.setDueWeek(new Date()); Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); referralApplyOrderModel.setParentId(babyModel.getId()); @@ -472,8 +474,7 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } - Date currentDate = DateUtil.formatDate(new Date()); - if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) { + if (null!=applyOrderQueryRequest.getYlStart()) { /* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1); @@ -483,12 +484,12 @@ public class ApplyOrderFacade { Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1),1); babyQuery.setBirthStart(end); babyQuery.setBirthEnd(start);*/ - Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart())); - referralApplyOrderQuery.setDueDateEnd(date); +// referralApplyOrderQuery.setDueDateEnd(date); + referralApplyOrderQuery.setDueDateStart(applyOrderQueryRequest.getYlStart()); } - if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { - referralApplyOrderQuery.setDueDateStart(DateUtil.addDay(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())-1),1)); + if (null!=applyOrderQueryRequest.getYlEnd()) { + referralApplyOrderQuery.setDueDateEnd(applyOrderQueryRequest.getYlEnd()); } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); @@ -566,14 +567,12 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthEnd(date); } //根据孕周 - if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) { - Date end= DateUtil.addDay(DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())), 6); - referralApplyOrderQuery.setDueDateEnd(end); + if (null != applyOrderQueryRequest.getEndDueWeek()) { + referralApplyOrderQuery.setDueDateEnd(applyOrderQueryRequest.getEndDueWeek()); } if (null != applyOrderQueryRequest.getStartDueWeek()) { - Date end= DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())); // int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek()) * 7; - referralApplyOrderQuery.setDueDateStart(end); + referralApplyOrderQuery.setDueDateStart( applyOrderQueryRequest.getStartDueWeek()); } if (null != applyOrderQueryRequest.getStartScore()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java index 48afcf0..69bacd0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java @@ -32,9 +32,9 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest { private Integer endAge; private Integer startAge; //孕周 - private String startDueWeek; + private Integer startDueWeek; - private String endDueWeek; + private Integer endDueWeek; //风险等级 private String rLevel; @@ -117,20 +117,19 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest { } - - public String getEndDueWeek() { + public Integer getEndDueWeek() { return endDueWeek; } - public void setEndDueWeek(String endDueWeek) { + public void setEndDueWeek(Integer endDueWeek) { this.endDueWeek = endDueWeek; } - public String getStartDueWeek() { + public Integer getStartDueWeek() { return startDueWeek; } - public void setStartDueWeek(String startDueWeek) { + public void setStartDueWeek(Integer startDueWeek) { this.startDueWeek = startDueWeek; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java index a62dd3c..a0cf0ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java @@ -15,11 +15,11 @@ public class BabyApplyOrderQueryRequest extends BasePageQueryRequest{ //儿童姓名 private String name; //月龄开始 - private String ylStart; + private Integer ylStart; //联系方式 private String phone; //月龄结束 - private String ylEnd; + private Integer ylEnd; //高危id private String highRisk; //预约检查日期 @@ -136,19 +136,19 @@ public class BabyApplyOrderQueryRequest extends BasePageQueryRequest{ this.tyVip = tyVip; } - public String getYlEnd() { + public Integer getYlEnd() { return ylEnd; } - public void setYlEnd(String ylEnd) { + public void setYlEnd(Integer ylEnd) { this.ylEnd = ylEnd; } - public String getYlStart() { + public Integer getYlStart() { return ylStart; } - public void setYlStart(String ylStart) { + public void setYlStart(Integer ylStart) { this.ylStart = ylStart; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java index 0de42bf..30d6b1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java @@ -135,7 +135,7 @@ public class BabyApplyOrderResult { setCyl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date()))); } if (null != referralApplyOrderModel.getBirth()) { - setYl(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), referralApplyOrderModel.getCreated()))); + setYl(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), referralApplyOrderModel.getDueWeek()))); } if (null != referralApplyOrderModel.getCreated()) { setCreated(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getCreated()));