From 307bc4b8cff25ea2c9db1afa44e2c06eb1513321 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 13 Sep 2016 19:40:46 +0800 Subject: [PATCH] code update --- .../biz/dal/impl/AntenatalExaminationDaoImpl.java | 2 +- .../platform/biz/dal/impl/PostReviewDaoImpl.java | 2 +- .../com/lyms/platform/common/utils/DateUtil.java | 8 ++-- .../platform/data/controller/SmsController.java | 45 +++++++++++++--------- .../platform/data/service/impl/SmsServiceImpl.java | 21 +++++----- 5 files changed, 45 insertions(+), 33 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 5aab2c9..6ca93d2 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 @@ -71,7 +71,7 @@ public class AntenatalExaminationDaoImpl extends BaseMongoDAOImpl queryYuyueAntenatalExamination(Date startDate,String hospitalId,String pid) { - AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte("startDate").lte(startDate).and("parentId").is("pid").and("hospitalId").is(hospitalId)); + AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(startDate).and("parentId").is("pid").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-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostReviewDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostReviewDaoImpl.java index 8a511ab..2b35ecc 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostReviewDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostReviewDaoImpl.java @@ -86,7 +86,7 @@ public class PostReviewDaoImpl extends BaseMongoDAOImpl impleme } @Override public List queryPostOrder(Date orderDate, String hospitalId,String parentId) { - AggregationOperation match = Aggregation.match(Criteria.where("nextCheckDate").gte(orderDate).lte(orderDate).and("hospitalId").is(hospitalId).and("parentId").is(parentId)); + AggregationOperation match = Aggregation.match(Criteria.where("nextCheckDate").gte(orderDate).and("hospitalId").is(hospitalId).and("parentId").is(parentId)); AggregationOperation group = Aggregation.group("parentId").max("created").as("created"); Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_postreview", PostReviewModel.class); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index f4e586c..193bc23 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -742,12 +742,12 @@ public class DateUtil { // System.out.println(s); // Date s = addDay(parseYMD("2016-02-26"), 168); - int start = 0; - int end = 1; + int start = 37; + int end = 37; - Date startDate = DateUtil.getNewDate(-end-1,"周",0); - Date endDate = DateUtil.getNewDate(-start,"周",0); + Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); + Date endDate = DateUtil.getNewDate(-start,"周",0+1); System.out.println(startDate + "==="+ endDate); } catch (Exception e) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java index 388201d..9c8643f 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java @@ -23,24 +23,33 @@ public class SmsController extends BaseController { @RequestMapping(value = "/template") public void productSms(HttpServletResponse response){ smsService.productTemplateSms(); - -// smsService.productChanAmsSms(); -// smsService.productYunAmsSms(); -// smsService.productChildAmsSms(); - -// MessageListRequest list = new MessageListRequest(); -// List messages = new ArrayList<>(); -// MessageRequest request = new MessageRequest(); -// request.setTypeId(1); -// request.setContent("aaaa"); -// request.setObjType(1); -// request.setPhone("123333"); -// request.setPlanTime("2015-01-06 15:22:12"); -// request.setServiceType(1); -// messages.add(request); -// list.setTypeId(1); -// list.setMessages(messages); -// SaveMessageService.saveSmsCenter(list); + smsService.productChanAmsSms(); + smsService.productYunAmsSms(); + smsService.productChildAmsSms(); writeString(response, "success"); } + + @RequestMapping(value = "/smsTemplate") + public void smsTemplate(HttpServletResponse response){ + smsService.productTemplateSms(); + writeString(response, "sms template success"); + } + + @RequestMapping(value = "/productChanAmsSms") + public void productChanAmsSms(HttpServletResponse response){ + smsService.productChanAmsSms(); + writeString(response, "chan ams success"); + } + + @RequestMapping(value = "/productYunAmsSms") + public void productYunAmsSms(HttpServletResponse response){ + smsService.productYunAmsSms(); + writeString(response, "yun ams success"); + } + + @RequestMapping(value = "/productChildAmsSms") + public void productChildAmsSms(HttpServletResponse response){ + smsService.productChildAmsSms(); + writeString(response, "child ams success"); + } } 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 d72bf44..1fe826e 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 @@ -550,12 +550,7 @@ public class SmsServiceImpl implements SmsService{ { for(MessageContent message : messageContents) { - //判断当前短信是否已经发送 通过短信ID和孕妇ID - boolean isExist = SaveMessageService.isExistSms(pat.getId(), message.getId()); - if (isExist) - { - continue; - } + String messageContent = "【"+messagePrefix+"】" + message.getContent(); MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.CHANOBJ.getId(), SmsServiceEnums.YBZD.getId(), @@ -623,7 +618,7 @@ public class SmsServiceImpl implements SmsService{ SmsConfigQuery configQuery = new SmsConfigQuery(); configQuery.setYn(YnEnums.YES.getId()); configQuery.setPrefixTypes(new Integer[]{0, 1}); -// configQuery.setHospitalId(221+""); + configQuery.setHospitalId(221 + ""); //查询出对应医院配置 List configs = smsConfigService.querySmsConfig(configQuery); @@ -764,7 +759,7 @@ public class SmsServiceImpl implements SmsService{ if (start != null && end != null) { - Date startDate = DateUtil.getNewDate(-end-1,"周",sendTimeType); + Date startDate = DateUtil.getNewDate(-end-1,"周",sendTimeType+1); Date endDate = DateUtil.getNewDate(-start,"周",sendTimeType); patientsQuery.setLastMensesStart(startDate); patientsQuery.setLastMensesEnd(endDate); @@ -2117,7 +2112,15 @@ public class SmsServiceImpl implements SmsService{ List chus = antenatalExaminationService.queryAntExChu(antExChuQuery); for (AntExChuModel chu : chus) { - idset.add(chu.getParentId()); + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentId(chu.getParentId()); + antExQuery.setYn(YnEnums.YES.getId()); + //复诊不存在 才添加 + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(list)) + { + idset.add(chu.getParentId()); + } } List fuzs = antenatalExaminationService.queryYuyueAntenatalExamination(yuYueDate, tempHid); -- 1.8.3.1