Commit 9bb081b87bdb64236435eaabd4f63543084b3291

Authored by litao@lymsh.com
1 parent fd66dfefed

bug

Showing 4 changed files with 5 additions and 4 deletions

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 9bb081b
... ... @@ -139,7 +139,7 @@
139 139  
140 140 <select id="findByType" parameterType="map" resultType="string">
141 141 select a.sequence_id, c.type from coupon_info a, coupon_template b, coupon_type c
142   - 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
  142 + 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
143 143 </select>
144 144  
145 145 <select id="findCityId" parameterType="string" resultType="string">
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 9bb081b
... ... @@ -909,7 +909,7 @@
909 909 if (checkModels != null && checkModels.size() > 0) {
910 910 BabyCheckModel checkModel = checkModels.get(0);
911 911 result = getBabyCheckResult(checkModel);
912   - result.setCouponCode(couponService.findByUsedId(id));
  912 + result.setCouponCode(couponService.findByType(id, 8));
913 913 /** 优惠券编号 */
914 914 String hemoglobinCoupon = couponService.findByType(id, 10);
915 915 if(StringUtils.isNotEmpty(hemoglobinCoupon)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 9bb081b
... ... @@ -2869,7 +2869,7 @@
2869 2869 result = getBabyCheckResult(checkModel, babyModel);
2870 2870  
2871 2871 /** 优惠券编号 */
2872   - result.setCouponCode(couponService.findByUsedId(id));
  2872 + result.setCouponCode(couponService.findByType(id, 8));
2873 2873 /** 优惠券编号血红蛋白 */
2874 2874 String hemoglobinCoupon = couponService.findByType(id, 10);
2875 2875 if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(hemoglobinCoupon)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 9bb081b
... ... @@ -146,9 +146,10 @@
146 146 if(babyModel == null) {
147 147 return false; // 需 要建档
148 148 }
149   - babyModel.setId(babyId);
  149 + babyModel.setId(null);
150 150 babyModel.setHospitalId(hospitalId);
151 151 babyModel.setEnable("2");
  152 + babyModel.setSource(babyId);
152 153 babyModel.setCreated(new Date());
153 154 mongoTemplate.save(babyModel);
154 155 return true;