Commit d6e3efb2aeb0bf16cd664bb91f824a6abad5a78c
1 parent
e43910b969
Exists in
master
and in
8 other branches
code update
Showing 1 changed file with 35 additions and 23 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
d6e3efb
| ... | ... | @@ -709,7 +709,7 @@ |
| 709 | 709 | SmsConfigQuery configQuery = new SmsConfigQuery(); |
| 710 | 710 | configQuery.setYn(YnEnums.YES.getId()); |
| 711 | 711 | configQuery.setPrefixTypes(new Integer[]{0, 1}); |
| 712 | -// configQuery.setHospitalId(221 + ""); | |
| 712 | +// configQuery.setHospitalId(242 + ""); | |
| 713 | 713 | |
| 714 | 714 | //查询出对应医院配置 |
| 715 | 715 | List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery); |
| 716 | 716 | |
| 717 | 717 | |
| ... | ... | @@ -1968,10 +1968,14 @@ |
| 1968 | 1968 | startDate = DateUtil.formatDate(startDate); |
| 1969 | 1969 | } |
| 1970 | 1970 | List<PostReviewModel> models = postReviewService.queryPostOrder(startDate, tempHid, pid); |
| 1971 | - for (PostReviewModel model : models) | |
| 1971 | + if (CollectionUtils.isNotEmpty(models)) | |
| 1972 | 1972 | { |
| 1973 | - idset.add(model.getId()); //这里的id就是parentid | |
| 1973 | + for (PostReviewModel model : models) | |
| 1974 | + { | |
| 1975 | + idset.add(model.getId()); //这里的id就是parentid | |
| 1976 | + } | |
| 1974 | 1977 | } |
| 1978 | + | |
| 1975 | 1979 | return idset.size() > 0; |
| 1976 | 1980 | } |
| 1977 | 1981 | |
| 1978 | 1982 | |
| ... | ... | @@ -1995,9 +1999,12 @@ |
| 1995 | 1999 | startDate = DateUtil.formatDate(startDate); |
| 1996 | 2000 | } |
| 1997 | 2001 | List<BabyCheckModel> models = babyBookbuildingService.queryBabyOrder(startDate, tempHid, pid); |
| 1998 | - for (BabyCheckModel model : models) | |
| 2002 | + if (CollectionUtils.isNotEmpty(models)) | |
| 1999 | 2003 | { |
| 2000 | - idset.add(model.getId()); | |
| 2004 | + for (BabyCheckModel model : models) | |
| 2005 | + { | |
| 2006 | + idset.add(model.getId()); | |
| 2007 | + } | |
| 2001 | 2008 | } |
| 2002 | 2009 | return idset.size() > 0; |
| 2003 | 2010 | } |
| 2004 | 2011 | |
| 2005 | 2012 | |
| 2006 | 2013 | |
| 2007 | 2014 | |
| 2008 | 2015 | |
| ... | ... | @@ -2328,32 +2335,37 @@ |
| 2328 | 2335 | antExChuQuery.setNextCheckTime(startDate); |
| 2329 | 2336 | antExChuQuery.setParentId(pid); |
| 2330 | 2337 | List<AntExChuModel> chus = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 2331 | - for (AntExChuModel chu : chus) | |
| 2338 | + if (CollectionUtils.isNotEmpty(chus)) | |
| 2332 | 2339 | { |
| 2333 | - PatientsQuery patientQuery = new PatientsQuery(); | |
| 2334 | - patientQuery.setYn(YnEnums.YES.getId()); | |
| 2335 | - patientQuery.setType(1); | |
| 2336 | - patientQuery.setId(chu.getParentId()); | |
| 2337 | - | |
| 2338 | - List<Patients> patientses = patientsService.queryPatient(patientQuery); | |
| 2339 | - if (CollectionUtils.isNotEmpty(patientses)) | |
| 2340 | + for (AntExChuModel chu : chus) | |
| 2340 | 2341 | { |
| 2341 | - AntExQuery antExQuery = new AntExQuery(); | |
| 2342 | - antExQuery.setParentId(chu.getParentId()); | |
| 2343 | - antExQuery.setYn(YnEnums.YES.getId()); | |
| 2344 | - //复诊不存在 才添加 | |
| 2345 | - List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); | |
| 2346 | - if (!CollectionUtils.isNotEmpty(list)) | |
| 2342 | + PatientsQuery patientQuery = new PatientsQuery(); | |
| 2343 | + patientQuery.setYn(YnEnums.YES.getId()); | |
| 2344 | + patientQuery.setType(1); | |
| 2345 | + patientQuery.setId(chu.getParentId()); | |
| 2346 | + | |
| 2347 | + List<Patients> patientses = patientsService.queryPatient(patientQuery); | |
| 2348 | + if (CollectionUtils.isNotEmpty(patientses)) | |
| 2347 | 2349 | { |
| 2348 | - idset.add(chu.getParentId()); | |
| 2350 | + AntExQuery antExQuery = new AntExQuery(); | |
| 2351 | + antExQuery.setParentId(chu.getParentId()); | |
| 2352 | + antExQuery.setYn(YnEnums.YES.getId()); | |
| 2353 | + //复诊不存在 才添加 | |
| 2354 | + List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); | |
| 2355 | + if (!CollectionUtils.isNotEmpty(list)) | |
| 2356 | + { | |
| 2357 | + idset.add(chu.getParentId()); | |
| 2358 | + } | |
| 2349 | 2359 | } |
| 2350 | 2360 | } |
| 2351 | 2361 | } |
| 2352 | 2362 | List<AntenatalExaminationModel> fuzs = antenatalExaminationService.queryYuyueAntenatalExamination(startDate, tempHid, pid); |
| 2353 | - | |
| 2354 | - for (AntenatalExaminationModel f : fuzs) | |
| 2363 | + if (CollectionUtils.isNotEmpty(fuzs)) | |
| 2355 | 2364 | { |
| 2356 | - idset.add(f.getId()); //这里的id就是parentid | |
| 2365 | + for (AntenatalExaminationModel f : fuzs) | |
| 2366 | + { | |
| 2367 | + idset.add(f.getId()); //这里的id就是parentid | |
| 2368 | + } | |
| 2357 | 2369 | } |
| 2358 | 2370 | return idset.size() > 0; |
| 2359 | 2371 | } |