From 29583e0f9f6f092002a7e87a1334c16d8feb31a0 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Tue, 17 May 2016 09:47:02 +0800
Subject: [PATCH]           bug fix

---
 .../java/com/lyms/platform/query/BabyModelQuery.java     | 14 +++++++++++++-
 .../web/controller/CommunityConfigController.java        | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 1efc6d2..d1f8d04 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -26,6 +26,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private String mphone;
     private String mname;
+    private String  communityId;
 
     public String getMname() {
         return mname;
@@ -35,6 +36,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         this.mname = mname;
     }
 
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
     public String getMphone() {
         return mphone;
     }
@@ -53,6 +62,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         this.areaId = areaId;
     }
 
+
     /**
      * 母亲的id
      */
@@ -161,7 +171,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != areaId) {
             condition = condition.and("areaId", areaId, MongoOper.IS);
         }
-
+        if(null!=communityId){
+            condition=condition.and("communityId",communityId,MongoOper.IS);
+        }
         if (null != keyword) {
             if (null != keyword) {
                 MongoCondition con1 = MongoCondition.newInstance("mphone", "^"+keyword, MongoOper.LIKE);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
index a5a1f09..0952a41 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
@@ -1,9 +1,7 @@
 package com.lyms.platform.operate.web.controller;
 
 import com.lyms.platform.biz.param.CommunityQuery;
-import com.lyms.platform.biz.service.BasicConfigService;
-import com.lyms.platform.biz.service.CommunityConfigService;
-import com.lyms.platform.biz.service.PatientsService;
+import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
@@ -17,7 +15,9 @@ import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.CommunityConfig;
 import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.query.BabyModelQuery;
 import com.lyms.platform.query.PatientsQuery;
+import com.lyms.platform.query.VisitQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -42,6 +42,8 @@ public class CommunityConfigController extends BaseController {
     private BasicConfigService basicConfigService;
     @Autowired
     private AutoMatchFacade autoMatchFacade;
+    @Autowired
+    private BabyService babyService;
 
 
     //添加管辖区域
@@ -173,6 +175,14 @@ public class CommunityConfigController extends BaseController {
             return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("该社区下有产妇数据不能删除！");
         }
 
+        BabyModelQuery babyModelQuery =  new BabyModelQuery();
+        babyModelQuery.setYn(YnEnums.YES.getId());
+        babyModelQuery.setCommunityId(id);
+        Integer count = babyService.queryBabyCount(babyModelQuery);
+        if (0 < count) {
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("该社区下有婴儿数据不能删除！");
+        }
+
         CommunityConfig communityConfig = new CommunityConfig();
         communityConfig.setId(id);
         communityConfig.setModifiedDate(System.currentTimeMillis());
-- 
1.8.3.1