From df577d98d5f1a7461278ec7fe30d0a0b7af4e525 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 31 Aug 2016 11:03:30 +0800
Subject: [PATCH] code update

---
 .../lyms/platform/common/enums/StopPregEnums.java  |  2 +-
 .../operate/web/facade/BookbuildingFacade.java     | 25 ++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java
index 286dbdb..2bc7363 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java
@@ -13,7 +13,7 @@ import java.util.Map;
 public enum StopPregEnums {
 
 
-  GFX(0,"高风险高危"),PTTZ(1,"胚胎停止发育"),FYYW(2,"妊娠早期服用药物"),CQZDYX(3,"产前诊断阳性"),OTHER(3,"其他");
+  GFX(0,"高风险高危"),PTTZ(1,"胚胎停止发育"),FYYW(2,"妊娠早期服用药物"),CQZDYX(3,"产前诊断阳性"),OTHER(4,"其他");
 
     StopPregEnums(int id, String name) {
         this.id = id;
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 81fb39f..109d5fd 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
@@ -155,12 +155,12 @@ public class BookbuildingFacade {
 			personModelQuery.setTypes(new Integer[]{1,3}); //孕妇或者产妇基本信息
 			List<PersonModel> personModels = personService.queryPersons(personModelQuery);
 
-			if (personModels == null || personModels.size() == 0)
-			{
-				personModelQuery.setPhone(yunRequest.getPregnantPhone());
-				personModelQuery.setCardNo(null);
-				personModels = personService.queryPersons(personModelQuery);
-			}
+//			if (personModels == null || personModels.size() == 0)
+//			{
+//				personModelQuery.setPhone(yunRequest.getPregnantPhone());
+//				personModelQuery.setCardNo(null);
+//				personModels = personService.queryPersons(personModelQuery);
+//			}
 
 
 			PersonModel pmodel = new PersonModel();
@@ -411,6 +411,19 @@ public class BookbuildingFacade {
 		Patients patient = getPatientsData(yunRequest);
 		patient.setModified(new Date());
 
+//		Integer type =  ServiceObjEnums.YUNOBJ.getId();
+//		if (patient.getLastMenses() != null)
+//		{
+//			Date date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
+//			Date currentDate = DateUtil.formatDate(new Date());
+//			if (date.getTime() <= currentDate.getTime())
+//			{
+//				type = ServiceObjEnums.CHANOBJ.getId();
+//			}
+//		}
+//		patient.setType(type);
+
+
 		if (!StringUtils.isEmpty(yunRequest.getPid()))
 		{
 			PersonModel pmodel = new PersonModel();
-- 
1.8.3.1