From b96b193acf68b5fbedac63eb9371755e6ed9b04e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 2 Nov 2016 16:34:37 +0800 Subject: [PATCH] code update --- .../biz/dal/impl/AntenatalExaminationDaoImpl.java | 3 +- .../platform/data/service/impl/SmsServiceImpl.java | 67 ++++++++++++---------- .../lyms/platform/data/util/AmsMessageService.java | 21 ++++--- .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- 4 files changed, 52 insertions(+), 41 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java index 6a9bbf2..62a64af 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java @@ -62,8 +62,7 @@ public class AntenatalExaminationDaoImpl extends BaseMongoDAOImpl queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) { - AggregationOperation match = Aggregation.match(Criteria.where("hospitalId").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId)); -// AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId)); + AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId)); AggregationOperation group = Aggregation.group("parentId").max("created").as("created"); Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index eeb33cd..fd972d9 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -253,8 +253,9 @@ public class SmsServiceImpl implements SmsService{ { message.setHighRiskId(String.valueOf(riskMap.get("id"))); } + highRiskContents.addAll(messageContents); } - highRiskContents.addAll(messageContents); + } if (CollectionUtils.isNotEmpty(highRiskContents)) { @@ -725,6 +726,9 @@ public class SmsServiceImpl implements SmsService{ continue; } + try { + + //循环每一个模板，根据模板条件查询到用户 发送短信 for (SmsTemplateModel template : templates) { @@ -1819,12 +1823,15 @@ public class SmsServiceImpl implements SmsService{ sendSms(list); } } - + } + catch (Exception e) + { + System.out.println("模板生成异常"+e); + e.printStackTrace(); + continue; + } } } - - - for (MessageRequest msg :allMsgs) { System.out.println("=======" + msg.getContent()); @@ -2230,19 +2237,19 @@ public class SmsServiceImpl implements SmsService{ for (AntenatalExaminationModel f : fuzs) { - - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(f.getId()); - - List list = antenatalExaminationService.queryLastAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) - { - if (list.get(0).getNextCheckTime() != null) - { - idset.add(f.getId()); //这里的id就是parentid - } - } + idset.add(f.getId()); //这里的id就是parentid +// AntExQuery antExQuery = new AntExQuery(); +// antExQuery.setYn(YnEnums.YES.getId()); +// antExQuery.setParentId(f.getId()); +// +// List list = antenatalExaminationService.queryLastAntenatalExamination(antExQuery.convertToQuery()); +// if (CollectionUtils.isNotEmpty(list)) +// { +// if (list.get(0).getNextCheckTime() != null) +// { +// idset.add(f.getId()); //这里的id就是parentid +// } +// } } return idset; } @@ -2288,18 +2295,20 @@ public class SmsServiceImpl implements SmsService{ for (AntenatalExaminationModel f : fuzs) { - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(f.getId()); + idset.add(f.getId()); //这里的id就是parentid - List list = antenatalExaminationService.queryLastAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) - { - if (list.get(0).getNextCheckTime() != null) - { - idset.add(f.getId()); //这里的id就是parentid - } - } +// AntExQuery antExQuery = new AntExQuery(); +// antExQuery.setYn(YnEnums.YES.getId()); +// antExQuery.setParentId(f.getId()); +// +// List list = antenatalExaminationService.queryLastAntenatalExamination(antExQuery.convertToQuery()); +// if (CollectionUtils.isNotEmpty(list)) +// { +// if (list.get(0).getNextCheckTime() != null) +// { +// idset.add(f.getId()); //这里的id就是parentid +// } +// } } return idset.size() > 0; } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java index 0254c76..ba85695 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -183,15 +183,18 @@ public class AmsMessageService { public static void main(String[] args) { -// Map> list = getMessageTemplateMap("242", -// AmsServiceTypeEnum.CHILD_GUIDE); -// -// List msgs = list.get("新生儿感染"); - for (int i = 0;i< 100 ;i++) - { - int index = (int)(Math.random()*8); - System.out.println(index); - } + Map> list = getMessageTemplateMap("221", + AmsServiceTypeEnum.CHILD_GUIDE); + + List msgs = list.get("甲亢"); + + System.out.println(msgs); + +// for (int i = 0;i< 100 ;i++) +// { +// int index = (int)(Math.random()*8); +// System.out.println(index); +// } // String result = "头：9.5|胸：10.0|腹：10.0"; // String b = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 65c4094..afb7afb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1595,7 +1595,7 @@ public class BabyBookbuildingFacade { } } - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC); return models; } -- 1.8.3.1