Commit fa8e7d038515d756cff132e80fe8ec27e7784fa6
1 parent
1c8955902a
Exists in
master
and in
8 other branches
短信修改
Showing 1 changed file with 7 additions and 19 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
fa8e7d0
| ... | ... | @@ -718,7 +718,7 @@ |
| 718 | 718 | SmsConfigQuery configQuery = new SmsConfigQuery(); |
| 719 | 719 | configQuery.setYn(YnEnums.YES.getId()); |
| 720 | 720 | configQuery.setPrefixTypes(new Integer[]{0, 1}); |
| 721 | -// configQuery.setHospitalId(242 + ""); | |
| 721 | +// configQuery.setHospitalId(221 + ""); | |
| 722 | 722 | |
| 723 | 723 | //查询出对应医院配置 |
| 724 | 724 | List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery); |
| 725 | 725 | |
| 726 | 726 | |
| ... | ... | @@ -2240,16 +2240,14 @@ |
| 2240 | 2240 | { |
| 2241 | 2241 | Set<String> idset = new HashSet<>(); |
| 2242 | 2242 | Date yuYueDate = DateUtil.addDay(new Date(), sendTimeType); |
| 2243 | - Date startDeate = DateUtil.addDay(new Date(), sendTimeType-1); | |
| 2244 | 2243 | if (yuYueDate != null) |
| 2245 | 2244 | { |
| 2246 | 2245 | //把时间格式化成 yyyy_MM_dd 的日期 |
| 2247 | 2246 | yuYueDate = DateUtil.formatDate(yuYueDate); |
| 2248 | - startDeate = DateUtil.formatDate(startDeate); | |
| 2249 | 2247 | } |
| 2250 | 2248 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 2251 | 2249 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 2252 | - antExChuQuery.setNextCheckTimeStart(startDeate); | |
| 2250 | + antExChuQuery.setNextCheckTimeStart(yuYueDate); | |
| 2253 | 2251 | antExChuQuery.setNextCheckTimeEnd(yuYueDate); |
| 2254 | 2252 | antExChuQuery.setHospitalId(tempHid); |
| 2255 | 2253 | List<AntExChuModel> chus = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 2256 | 2254 | |
| ... | ... | @@ -2260,22 +2258,12 @@ |
| 2260 | 2258 | AntExQuery antExQuery = new AntExQuery(); |
| 2261 | 2259 | antExQuery.setParentId(chu.getParentId()); |
| 2262 | 2260 | antExQuery.setYn(YnEnums.YES.getId()); |
| 2263 | - | |
| 2264 | - PatientsQuery patientQuery = new PatientsQuery(); | |
| 2265 | - patientQuery.setYn(YnEnums.YES.getId()); | |
| 2266 | - patientQuery.setType(1); | |
| 2267 | - patientQuery.setId(chu.getParentId()); | |
| 2268 | - | |
| 2269 | - List<Patients> patientses = patientsService.queryPatient(patientQuery); | |
| 2270 | - if (CollectionUtils.isNotEmpty(patientses)) | |
| 2261 | + antExQuery.setHospitalId(tempHid); | |
| 2262 | + //复诊不存在 才添加 | |
| 2263 | + List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); | |
| 2264 | + if (!CollectionUtils.isNotEmpty(list)) | |
| 2271 | 2265 | { |
| 2272 | - //复诊不存在 才添加 | |
| 2273 | - List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); | |
| 2274 | - if (!CollectionUtils.isNotEmpty(list)) | |
| 2275 | - { | |
| 2276 | - idset.add(chu.getParentId()); | |
| 2277 | - } | |
| 2278 | - | |
| 2266 | + idset.add(chu.getParentId()); | |
| 2279 | 2267 | } |
| 2280 | 2268 | |
| 2281 | 2269 | } |