Commit d8f6a79cd4ac06ccb9a4efdbde85032cdac58c37
1 parent
a31cb3c1fc
Exists in
master
and in
1 other branch
code update
Showing 2 changed files with 10 additions and 7 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
d8f6a79
| ... | ... | @@ -742,12 +742,15 @@ |
| 742 | 742 | // System.out.println(s); |
| 743 | 743 | // Date s = addDay(parseYMD("2016-02-26"), 168); |
| 744 | 744 | |
| 745 | - int start = 37; | |
| 746 | - int end = 37; | |
| 745 | + int start = 42; | |
| 746 | + int end = 42; | |
| 747 | 747 | |
| 748 | 748 | |
| 749 | - Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); | |
| 750 | - Date endDate = DateUtil.getNewDate(-start,"周",0+1); | |
| 749 | +// Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); | |
| 750 | +// Date endDate = DateUtil.getNewDate(-start,"周",0+1); | |
| 751 | + | |
| 752 | + Date startDate = DateUtil.getNewDate(-end,"天",1); | |
| 753 | + Date endDate = DateUtil.getNewDate(-start,"天",1); | |
| 751 | 754 | |
| 752 | 755 | System.out.println(startDate + "==="+ endDate); |
| 753 | 756 | } catch (Exception e) |
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
d8f6a79
| ... | ... | @@ -620,7 +620,7 @@ |
| 620 | 620 | SmsConfigQuery configQuery = new SmsConfigQuery(); |
| 621 | 621 | configQuery.setYn(YnEnums.YES.getId()); |
| 622 | 622 | configQuery.setPrefixTypes(new Integer[]{0, 1}); |
| 623 | - configQuery.setHospitalId(221 + ""); | |
| 623 | +// configQuery.setHospitalId(221 + ""); | |
| 624 | 624 | |
| 625 | 625 | //查询出对应医院配置 |
| 626 | 626 | List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery); |
| ... | ... | @@ -1424,8 +1424,8 @@ |
| 1424 | 1424 | if (start != null && end != null) { |
| 1425 | 1425 | Date startDate = DateUtil.getNewDate(-end, "天", sendTimeType); |
| 1426 | 1426 | Date endDate = DateUtil.getNewDate(-start, "天", sendTimeType); |
| 1427 | - patientsQuery.setBirthStart(startDate); | |
| 1428 | - patientsQuery.setBirthEnd(endDate); | |
| 1427 | + patientsQuery.setFmDateStart(startDate); | |
| 1428 | + patientsQuery.setFmDateEnd(endDate); | |
| 1429 | 1429 | List<Patients> patientses = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 1430 | 1430 | for(Patients pat : patientses) |
| 1431 | 1431 | { |