From 91e9d1a667bcfa2118fb3c389752470e7650ac9a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 6 Jul 2016 10:23:32 +0800
Subject: [PATCH] update code

---
 .../lyms/platform/data/util/SaveMessageService.java  | 20 +++++++++++++++++---
 .../operate/web/facade/BookbuildingFacade.java       | 18 ++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java
index c8eed26..bfa6f5e 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java
@@ -13,12 +13,13 @@ import java.util.List;
  */
 public class SaveMessageService {
 
-    public static final String  URL = "http://localhost:8090/v1/saveCreatedSMS";
+    public static final String  URL = "http://192.168.5.3:8080/v1/saveCreatedSMS";
 
     public static boolean saveSmsCenter(MessageListRequest list)
     {
         String json = JsonUtil.obj2JsonString(list);
         String result = HttpRequest.sendPost(URL,json,"YMer2016");
+        System.out.print(result);
         return false;
     }
 
@@ -28,12 +29,25 @@ public class SaveMessageService {
         List<MessageRequest> messages = new ArrayList<>();
         MessageRequest request = new MessageRequest();
         request.setTypeId(1);
-        request.setContent("aaaa");
+        request.setContent("222222222222222");
         request.setObjType(1);
-        request.setPhone("123333");
+        request.setPhone("18382670032");
         request.setPlanTime("2015-01-06 15:22:12");
         request.setServiceType(1);
+        request.setStatus(1);
         messages.add(request);
+
+
+        MessageRequest request1 = new MessageRequest();
+        request1.setTypeId(1);
+        request1.setContent("1111111111111111");
+        request1.setObjType(1);
+        request1.setPhone("18382670031");
+        request1.setPlanTime("2015-01-06 15:22:12");
+        request1.setServiceType(1);
+        request1.setStatus(1);
+        messages.add(request1);
+
         list.setTypeId(1);
         list.setMessages(messages);
         saveSmsCenter(list);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index e63e025..8c3c0a9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -63,16 +63,22 @@ public class BookbuildingFacade {
 		patientsQuery.setYn(YnEnums.YES.getId());
 		patientsQuery.setType(1);
 		patientsQuery.setHospitalId(yunRequest.getHospitalId());
+		patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum());
 
-		//判断该身份证号码是否有孕妇建档 在该医院
-		List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
-		if (CollectionUtils.isNotEmpty(patients))
+		if (yunRequest.getPregnantCertificateNum() != null)
 		{
-			br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
-			br.setErrormsg("孕妇在该医院已建档");
-			return br;
+            //判断该身份证号码是否有孕妇建档 在该医院
+			List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+			if (CollectionUtils.isNotEmpty(patients))
+			{
+				br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+				br.setErrormsg("孕妇在该医院已建档");
+				return br;
+			}
 		}
 
+
+
 		PersonModel pmodel = new PersonModel();
 		pmodel.setName(yunRequest.getPregnantName());
 		pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday()));
-- 
1.8.3.1