From 9bb081b87bdb64236435eaabd4f63543084b3291 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 3 Aug 2017 13:42:54 +0800
Subject: [PATCH] bug

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml                 | 2 +-
 .../java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java     | 2 +-
 .../src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 2 +-
 .../com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index 1bd7bba..7dd3eec 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -139,7 +139,7 @@
 
     <select id="findByType" parameterType="map" resultType="string">
         select a.sequence_id, c.type from coupon_info a, coupon_template b, coupon_type c
-        where a.coupon_template_id = b.id and b.type_id = c.id and a.used_id = #{userId} and c.type = #{type}  limit 0,1
+        where a.coupon_template_id = b.id and b.type_id = c.id and a.used_id = #{usedId} and c.type = #{type}  limit 0,1
     </select>
 
     <select id="findCityId" parameterType="string" resultType="string">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index fc1ce96..b83bd98 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -909,7 +909,7 @@ public class BabyCheckFacade {
             if (checkModels != null && checkModels.size() > 0) {
                 BabyCheckModel checkModel = checkModels.get(0);
                 result = getBabyCheckResult(checkModel);
-                result.setCouponCode(couponService.findByUsedId(id));
+                result.setCouponCode(couponService.findByType(id, 8));
                 /** 优惠券编号 */
                 String hemoglobinCoupon = couponService.findByType(id, 10);
                 if(StringUtils.isNotEmpty(hemoglobinCoupon)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index ca7766a..449dca9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -2869,7 +2869,7 @@ public class ViewFacade {
                 result = getBabyCheckResult(checkModel, babyModel);
 
                 /** 优惠券编号 */
-                result.setCouponCode(couponService.findByUsedId(id));
+                result.setCouponCode(couponService.findByType(id, 8));
                 /** 优惠券编号血红蛋白 */
                 String hemoglobinCoupon = couponService.findByType(id, 10);
                 if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(hemoglobinCoupon)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index bbe2b37..99d24d5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -146,9 +146,10 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
             if(babyModel == null) {
                 return false; // 需 要建档
             }
-            babyModel.setId(babyId);
+            babyModel.setId(null);
             babyModel.setHospitalId(hospitalId);
             babyModel.setEnable("2");
+            babyModel.setSource(babyId);
             babyModel.setCreated(new Date());
             mongoTemplate.save(babyModel);
             return true;
-- 
1.8.3.1