From b170276852dff0b9ad97b0c71943e89da6a7ca42 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 23 Aug 2016 17:48:59 +0800
Subject: [PATCH] code update

---
 .../operate/web/facade/BasicConfigFacade.java      | 15 ++++-
 .../operate/web/facade/BookbuildingFacade.java     | 66 ++++++++++++----------
 .../operate/web/result/BasicConfigResult.java      | 12 ++++
 3 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
index 78ff79e..f122d1b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
@@ -179,7 +179,7 @@ public class BasicConfigFacade {
 
     /**
      * 根据类型查询响应的 基础数据
-     *
+     *[[ycs],[jws]]
      * @param type
      * @return
      */
@@ -193,6 +193,19 @@ public class BasicConfigFacade {
 
         if (!StringUtils.isEmpty(parentId)) {
             results = getBaseicConfigByParentId(parentId);
+
+            if ("jws".equals(ConfigTypeEnums.JWS.getType()))
+            {
+
+                for(BasicConfigResult result : results)
+                {
+                    if (results != null && StringUtils.isNotEmpty(result.getId()))
+                    {
+                        List<BasicConfigResult> childConfigs =  getBaseicConfigByParentId(result.getId());
+                        result.setChildConfigs(childConfigs);
+                    }
+                }
+            }
         }
         objectResponse.setData(results);
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
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 a16da33..ac849ce 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
@@ -365,41 +365,45 @@ public class BookbuildingFacade {
 			List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
 			if (CollectionUtils.isNotEmpty(patients))
 			{
-				br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
-				br.setErrormsg("该身份证在医院已经建档");
-				return br;
-			}
-		}
-		if (yunRequest.getPregnantPhone() != null)
-		{
-			patientsQuery.setCardNo(null);
-			patientsQuery.setPhone(yunRequest.getPregnantPhone());
-			//判断该手机号码在 孕期内有没有建档
-			List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
-			if (CollectionUtils.isNotEmpty(patients))
-			{
-				br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
-				br.setErrormsg("该手机号码已经建档");
-				return br;
-			}
-		}
+				Patients pat = patients.get(0);
+				if (pat != null && !pat.getPhone().equals(yunRequest.getPregnantPhone()))
+				{
+					if (StringUtils.isNotEmpty(yunRequest.getPregnantPhone())) {
+						patientsQuery.setCardNo(null);
+						patientsQuery.setPhone(yunRequest.getPregnantPhone());
+						//判断该手机号码在 孕期内有没有建档
+						patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+						if (CollectionUtils.isNotEmpty(patients)) {
+							br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+							br.setErrormsg("该手机号码已经建档");
+							return br;
+						}
+					}
+				}
 
-		//就诊卡号判断
-		if (StringUtils.isNotEmpty(yunRequest.getVcCardNo()))
-		{
-			patientsQuery.setCardNo(null);
-			patientsQuery.setPhone(null);
-			patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
-			patientsQuery.setHospitalId(yunRequest.getHospitalId());
-			List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
-			if (CollectionUtils.isNotEmpty(patients))
-			{
-				br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
-				br.setErrormsg("该就诊卡号在该医院已经建档");
-				return br;
+				if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) &&  !pat.getVcCardNo().equals(yunRequest.getVcCardNo()))
+				{
+
+					//就诊卡号判断
+					if (StringUtils.isNotEmpty(yunRequest.getVcCardNo()))
+					{
+						patientsQuery.setCardNo(null);
+						patientsQuery.setPhone(null);
+						patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
+						patientsQuery.setHospitalId(yunRequest.getHospitalId());
+						patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+						if (CollectionUtils.isNotEmpty(patients))
+						{
+							br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+							br.setErrormsg("该就诊卡号在该医院已经建档");
+							return br;
+						}
+					}
+				}
 			}
 		}
 
+
 		Patients patient = getPatientsData(yunRequest);
 		patient.setModified(new Date());
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
index 06d8be6..cd53094 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
@@ -4,6 +4,8 @@ import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.PuerperaModel;
 
+import java.util.List;
+
 public class BasicConfigResult  implements IBasicResultConvert<BasicConfigResult,BasicConfig> {
     private String id;
     private String code;
@@ -12,6 +14,16 @@ public class BasicConfigResult  implements IBasicResultConvert<BasicConfigResult
     private String name;
     private String desc;
 
+    private List<BasicConfigResult> childConfigs;
+
+    public List<BasicConfigResult> getChildConfigs() {
+        return childConfigs;
+    }
+
+    public void setChildConfigs(List<BasicConfigResult> childConfigs) {
+        this.childConfigs = childConfigs;
+    }
+
     public String getDesc() {
         return desc;
     }
-- 
1.8.3.1