Commit 1bbd98844934c48e46a4ade60bf1c53ead76f384
1 parent
22f1bedf19
Exists in
master
and in
8 other branches
短信修改
Showing 1 changed file with 19 additions and 16 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
1bbd988
| ... | ... | @@ -2242,29 +2242,32 @@ |
| 2242 | 2242 | antExChuQuery.setNextCheckTimeEnd(yuYueDate); |
| 2243 | 2243 | antExChuQuery.setHospitalId(tempHid); |
| 2244 | 2244 | List<AntExChuModel> chus = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 2245 | - for (AntExChuModel chu : chus) | |
| 2245 | + if (CollectionUtils.isNotEmpty(chus)) | |
| 2246 | 2246 | { |
| 2247 | - AntExQuery antExQuery = new AntExQuery(); | |
| 2248 | - antExQuery.setParentId(chu.getParentId()); | |
| 2249 | - antExQuery.setYn(YnEnums.YES.getId()); | |
| 2247 | + for (AntExChuModel chu : chus) | |
| 2248 | + { | |
| 2249 | + AntExQuery antExQuery = new AntExQuery(); | |
| 2250 | + antExQuery.setParentId(chu.getParentId()); | |
| 2251 | + antExQuery.setYn(YnEnums.YES.getId()); | |
| 2250 | 2252 | |
| 2251 | - PatientsQuery patientQuery = new PatientsQuery(); | |
| 2252 | - patientQuery.setYn(YnEnums.YES.getId()); | |
| 2253 | - patientQuery.setType(1); | |
| 2254 | - patientQuery.setId(chu.getParentId()); | |
| 2253 | + PatientsQuery patientQuery = new PatientsQuery(); | |
| 2254 | + patientQuery.setYn(YnEnums.YES.getId()); | |
| 2255 | + patientQuery.setType(1); | |
| 2256 | + patientQuery.setId(chu.getParentId()); | |
| 2255 | 2257 | |
| 2256 | - List<Patients> patientses = patientsService.queryPatient(patientQuery); | |
| 2257 | - if (CollectionUtils.isNotEmpty(patientses)) | |
| 2258 | - { | |
| 2259 | - //复诊不存在 才添加 | |
| 2260 | - List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); | |
| 2261 | - if (!CollectionUtils.isNotEmpty(list)) | |
| 2258 | + List<Patients> patientses = patientsService.queryPatient(patientQuery); | |
| 2259 | + if (CollectionUtils.isNotEmpty(patientses)) | |
| 2262 | 2260 | { |
| 2263 | - idset.add(chu.getParentId()); | |
| 2261 | + //复诊不存在 才添加 | |
| 2262 | + List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); | |
| 2263 | + if (!CollectionUtils.isNotEmpty(list)) | |
| 2264 | + { | |
| 2265 | + idset.add(chu.getParentId()); | |
| 2266 | + } | |
| 2267 | + | |
| 2264 | 2268 | } |
| 2265 | 2269 | |
| 2266 | 2270 | } |
| 2267 | - | |
| 2268 | 2271 | } |
| 2269 | 2272 | |
| 2270 | 2273 | PatientsQuery patientQuery = new PatientsQuery(); |