jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d7f524f20a76707f1c55d142d252684c361f4a72

Authored by liquanyu
1 parent 4bac2f20a0
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

孕妇建档

Showing 3 changed files with 6 additions and 6 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ d7f524f
... ... @@ -606,8 +606,8 @@
606 606 System.out.println(new DateTime().minusDays(77));*/
607 607 // System.out.println(getDaySeconds());
608 608  
609   - String s = getBabyMonthAge(parseYMD("2015-06-07"), new Date());
610   - System.out.println(s);
  609 +// String s = getBabyMonthAge(parseYMD("2015-06-07"), new Date());
  610 +// System.out.println(s);
611 611 // SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd ");
612 612 // System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date()));
613 613 // System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108)));
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ d7f524f
... ... @@ -834,7 +834,7 @@
834 834 */
835 835 Date endDate = DateUtil.getNewDate(-42, "周", 0);
836 836 //把时间格式化成 yyyy_MM_dd 的日期
837   - endDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(endDate));
  837 + endDate = DateUtil.formatDate(endDate);
838 838 patientsQuery.setYn(YnEnums.YES.getId());
839 839 //1孕妇
840 840 patientsQuery.setType(1);
... ... @@ -1001,6 +1001,7 @@
1001 1001 }
1002 1002 }
1003 1003 }
  1004 + //儿童月龄
1004 1005 else if (specialDateType == SpecialDateEnums.ETYL.getId())
1005 1006 {
1006 1007 Integer start = template.getStart();
... ... @@ -1173,7 +1174,7 @@
1173 1174 babyModelQuery.setYn(YnEnums.YES.getId());
1174 1175 Date babyEndDate = DateUtil.getNewDate(-36, "月", 0);
1175 1176 //把时间格式化成 yyyy_MM_dd 的日期
1176   - babyEndDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(babyEndDate));
  1177 + babyEndDate = DateUtil.formatDate(babyEndDate);
1177 1178  
1178 1179 babyModelQuery.setBirthStart(babyEndDate);
1179 1180 babyModelQuery.setBirthEnd(babyEndDate);
... ... @@ -1266,7 +1267,6 @@
1266 1267 query.setId(orderModel.getParentId());
1267 1268  
1268 1269 messages.addAll(getChanMessageRequestList(patientsQuery,config,template));
1269   -
1270 1270 }
1271 1271 }
1272 1272 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ d7f524f
... ... @@ -109,7 +109,7 @@
109 109 {
110 110 Date date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
111 111 Date currentDate = DateUtil.formatDate(new Date());
112   - if (date.getTime() >= currentDate.getTime())
  112 + if (date.getTime() <= currentDate.getTime())
113 113 {
114 114 type = 3;
115 115 }