From d46ffdbb6b00fcc354af1bec4d8185db4647e2d7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 8 Nov 2016 09:59:34 +0800
Subject: [PATCH] code update

---
 .../biz/dal/impl/AntenatalExaminationDaoImpl.java  |  2 +-
 .../lyms/platform/common/utils/HttpRequest.java    |  7 +++---
 .../platform/data/service/impl/SmsServiceImpl.java | 25 +++++++++++++++++++---
 .../lyms/platform/data/util/AmsMessageService.java |  2 +-
 4 files changed, 28 insertions(+), 8 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 f618d79..f69e3ff 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
@@ -73,7 +73,7 @@ public class AntenatalExaminationDaoImpl  extends BaseMongoDAOImpl<AntenatalExam
     public List<AntenatalExaminationModel> queryYuyueAntenatalExamination(Date yuYueDate,String 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(group,match);
+        Aggregation aggregation = Aggregation.newAggregation(match,group);
         AggregationResults<AntenatalExaminationModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class);
         return result.getMappedResults();
 //        AggregationOperation match = Aggregation.match(Criteria.where("hospitalId").is(hospitalId));
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java
index b58e407..b6074a6 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java
@@ -117,9 +117,10 @@ public class HttpRequest {
             // 获取所有响应头字段
             Map<String, List<String>> map = connection.getHeaderFields();
             // 遍历所有的响应头字段
-            for (String key : map.keySet()) {
-                System.out.println(key + "--->" + map.get(key));
-            }
+//            for (String key : map.keySet()) {
+//                System.out.println(key + "--->" + map.get(key));
+//            }
+            System.out.println("--->" + map);
             // 定义 BufferedReader输入流来读取URL的响应
             in = new BufferedReader(new InputStreamReader(
                     connection.getInputStream(),"utf-8"));
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 db532aa..bdf0074 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
@@ -37,6 +37,9 @@ public class SmsServiceImpl implements SmsService{
 
     public static final String  SEND_TIME= PropertiesUtils.getPropertyValue("send_time");
 
+
+    private List<MessageRequest> allMsgs = new ArrayList<>();
+
     @Autowired
     private SmsConfigService smsConfigService;
 
@@ -88,7 +91,7 @@ public class SmsServiceImpl implements SmsService{
         String week = DateUtil.getWeekOfDate(new Date());
         query.setGuideTime(week);
 
-//        query.setHospitalId(221+"");
+//        query.setHospitalId(221 + "");
 
         //查询出对应周几要发送的的医院配置
         List<SmsConfigModel> configs =  smsConfigService.querySmsConfig(query);
@@ -349,6 +352,11 @@ public class SmsServiceImpl implements SmsService{
            }
         }
 
+        for (MessageRequest msg :allMsgs)
+        {
+            System.out.println("孕妇ams短信=======" + msg.getContent());
+        }
+
     }
 
 
@@ -519,6 +527,12 @@ public class SmsServiceImpl implements SmsService{
             }
         }
 
+        for (MessageRequest msg :allMsgs)
+        {
+            System.out.println("儿童ams短信=======" + msg.getContent());
+        }
+
+
     }
 
 
@@ -638,6 +652,12 @@ public class SmsServiceImpl implements SmsService{
             }
         }
 
+        for (MessageRequest msg :allMsgs)
+        {
+            System.out.println("产妇ams短信=======" + msg.getContent());
+        }
+
+
     }
 
     /**
@@ -1830,7 +1850,7 @@ public class SmsServiceImpl implements SmsService{
         }
         for (MessageRequest msg :allMsgs)
         {
-            System.out.println("=======" + msg.getContent());
+            System.out.println("模板短信=======" + msg.getContent());
         }
     }
 
@@ -2347,7 +2367,6 @@ public class SmsServiceImpl implements SmsService{
         return request;
     }
 
-    private List<MessageRequest> allMsgs = new ArrayList<>();
 
     /**
      * 发送短信到短信中心
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 ba85695..87b97ef 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
@@ -186,7 +186,7 @@ public class AmsMessageService {
         Map<String,List<MessageContent>> list = getMessageTemplateMap("221",
                 AmsServiceTypeEnum.CHILD_GUIDE);
 
-        List<MessageContent> msgs = list.get("甲亢");
+        List<MessageContent> msgs = list.get("肺结核");
 
         System.out.println(msgs);
 
-- 
1.8.3.1