From 856c2aad18b4dfb7cba64c0b4402d2d08270e931 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 2 May 2016 17:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientFacade.java | 38 +++++++++++++++++-----
 .../request/PuerperaMatcherCommunityRequest.java   | 14 ++++++++
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index a3f6cef..fb3eb20 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -50,23 +50,43 @@ public class PatientFacade {
      * @return
      */
     public BaseResponse matchCommunity(PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest) {
-        Patients puerperaModel = patientsService.findOnePatientById(puerperaMatcherCommunityRequest.getParentId());
 
-        Assert.notNull(puerperaModel, "产妇信息不存在");
+        if(0==puerperaMatcherCommunityRequest.getT()){
+            Patients puerperaModel = patientsService.findOnePatientById(puerperaMatcherCommunityRequest.getParentId());
 
-        puerperaModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId());
-        patientsService.updatePatient(puerperaModel);
+            Assert.notNull(puerperaModel, "产妇信息不存在");
 
+            puerperaModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId());
+            patientsService.updatePatient(puerperaModel);
+            //修改新生儿的社区信息
+            updateBabyCommunity(puerperaModel.getId(),puerperaModel.getPhone(),puerperaMatcherCommunityRequest.getCommunityId(),Boolean.FALSE);
+
+        }else{
+            updateBabyCommunity(puerperaMatcherCommunityRequest.getParentId(), null, puerperaMatcherCommunityRequest.getCommunityId(), Boolean.TRUE);
+        }
+
+        //TODO 产妇分配了社区，需要给对应的社区提示消息
+        return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
+    }
+
+    /**
+     * 修改新生儿的社区信息
+     */
+    private void updateBabyCommunity(String parentId,String phone,String communityId,boolean isBaby){
         BabyModelQuery babyModelQuery = new BabyModelQuery();
-        babyModelQuery.setParentId(puerperaModel.getId());
         babyModelQuery.setYn(YnEnums.YES.getId());
+        if(isBaby){
+            babyModelQuery.setId(parentId);
+        }else{
+            babyModelQuery.setParentId(parentId);
+        }
 
         BabyModel babyModel = new BabyModel();
-        babyModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId());
-        babyModel.setMphone(puerperaModel.getPhone());
+        babyModel.setCommunityId(communityId);
+        if(StringUtils.isNotEmpty(phone)){
+            babyModel.setMphone(phone);
+        }
         babyService.findAndModify(babyModelQuery.convertToQuery(),babyModel);
-        //TODO 产妇分配了社区，需要给对应的社区提示消息
-        return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
     }
 
     /**
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
index f6b152f..cbd6428 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
@@ -18,6 +18,12 @@ public class PuerperaMatcherCommunityRequest {
     @NotEmpty(message = "communityId不能为空")
     private String communityId;
 
+    /**
+     * t表示type 0 为产妇 1为新生儿
+     */
+    @FormParam
+    private int t=0;
+
     public String getCommunityId() {
         return communityId;
     }
@@ -33,4 +39,12 @@ public class PuerperaMatcherCommunityRequest {
     public void setParentId(String parentId) {
         this.parentId = parentId;
     }
+
+    public int getT() {
+        return t;
+    }
+
+    public void setT(int t) {
+        this.t = t;
+    }
 }
-- 
1.8.3.1