From aa479d4c67fde8ab5e294c206550d551f0083d51 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 18 Jul 2016 11:48:58 +0800
Subject: [PATCH] update code

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 25 +++++++++++++++++++---
 .../operate/web/result/BabyCheckResult.java        |  3 +--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 0be81f3..3e4e83e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -137,6 +137,23 @@ public class BabyBookbuildingFacade {
      */
     public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) {
 
+        //判断儿童的就诊卡号是否建档 在该家医院
+        if (StringUtils.isNotEmpty(request.getVcCardNo()))
+        {
+            BabyModelQuery babyQuery = new BabyModelQuery();
+            babyQuery.setYn(YnEnums.YES.getId());
+            babyQuery.setVcCardNo(request.getVcCardNo());
+            babyQuery.setHospitalId(request.getHospitalId());
+            List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+            if (CollectionUtils.isNotEmpty(models))
+            {
+                BaseObjectResponse br = new BaseObjectResponse();
+                br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+                br.setErrormsg("该就诊卡号儿童已经建档");
+                return br;
+            }
+        }
+
         //通过查询是否有该孕妇
         PatientsQuery puerperaQuery = new PatientsQuery();
         puerperaQuery.setCardNo(request.getMommyCertificateNum());
@@ -196,13 +213,15 @@ public class BabyBookbuildingFacade {
                     DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
             babyQuery.setCardId(cardId);
             count = babyBookbuildingService.queryBabyCount(babyQuery);
-            model.setCardId(cardId + request.getSex() + count + 1);
-        } else {
+            model.setCardId(cardId + request.getSex() + (count + 1));
+        }
+        if (StringUtils.isNotEmpty(request.getMommyPhone()))
+        {
             String phoneId = request.getMommyPhone() +
                     DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
             babyQuery.setPhoneId(phoneId);
             count = babyBookbuildingService.queryBabyCount(babyQuery);
-            model.setPhoneId(phoneId + request.getSex() + count + 1);
+            model.setPhoneId(phoneId + request.getSex() + (count + 1));
         }
 
         model.setParentId(patients.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
index 4bcddcb..f08f1d5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
@@ -207,10 +207,9 @@ public class BabyCheckResult {
 
     //检查时间
     private String checkDate;
-
-    //月龄
     private String monthAge;
 
+
     public String getMonthAge() {
         return monthAge;
     }
-- 
1.8.3.1