Commit b5e4cc579ba9c22bb6e9a2fe2cc83dedd0a63829
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
b5e4cc5
| ... | ... | @@ -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); |
| ... | ... | @@ -661,6 +661,12 @@ |
| 661 | 661 | for (SmsTemplateModel template : templates) |
| 662 | 662 | { |
| 663 | 663 | |
| 664 | + if (!("57d65fa80cf2798825ca2d87".equals(template.getId())) ) | |
| 665 | + { | |
| 666 | + continue; | |
| 667 | + } | |
| 668 | + | |
| 669 | + | |
| 664 | 670 | //模板属于的医院id |
| 665 | 671 | String tempHid = template.getHospitalId(); |
| 666 | 672 | |
| ... | ... | @@ -1424,6 +1430,8 @@ |
| 1424 | 1430 | if (start != null && end != null) { |
| 1425 | 1431 | Date startDate = DateUtil.getNewDate(-end, "天", sendTimeType); |
| 1426 | 1432 | Date endDate = DateUtil.getNewDate(-start, "天", sendTimeType); |
| 1433 | + startDate = DateUtil.formatDate(startDate); | |
| 1434 | + endDate = DateUtil.formatDate(endDate); | |
| 1427 | 1435 | patientsQuery.setFmDateStart(startDate); |
| 1428 | 1436 | patientsQuery.setFmDateEnd(endDate); |
| 1429 | 1437 | List<Patients> patientses = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| ... | ... | @@ -2119,7 +2127,7 @@ |
| 2119 | 2127 | antExQuery.setYn(YnEnums.YES.getId()); |
| 2120 | 2128 | //复诊不存在 才添加 |
| 2121 | 2129 | List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
| 2122 | - if (CollectionUtils.isNotEmpty(list)) | |
| 2130 | + if (!CollectionUtils.isNotEmpty(list)) | |
| 2123 | 2131 | { |
| 2124 | 2132 | idset.add(chu.getParentId()); |
| 2125 | 2133 | } |