From aaccb8ab7f64c22dc754d5b9051363321eed0ec3 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 3 Aug 2017 00:09:52 +0800 Subject: [PATCH] bug --- .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 11 +++++------ .../com/lyms/platform/operate/web/result/BabyCheckResult.java | 11 +++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) 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 32d94f6..97e2f47 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 @@ -475,11 +475,6 @@ public class BabyCheckFacade { resMap.put("baseInfo", base); resMap.put("checkList", list); - /** 优惠券编号 */ - String hemoglobinCoupon = couponService.findByUsedId(id); - if(StringUtils.isNotEmpty(hemoglobinCoupon)) { - resMap.put("hemoglobinCoupon", hemoglobinCoupon); - } br.setData(resMap); br.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -915,12 +910,16 @@ public class BabyCheckFacade { BabyCheckModel checkModel = checkModels.get(0); result = getBabyCheckResult(checkModel); result.setCouponCode(couponService.findByUsedId(id)); + /** 优惠券编号 */ + String hemoglobinCoupon = couponService.findByUsedId(id); + if(StringUtils.isNotEmpty(hemoglobinCoupon)) { + result.setHemoglobinCoupon(hemoglobinCoupon); + } } } - br.setData(result); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); 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 5f0f712..c2a19c1 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 @@ -9,6 +9,9 @@ import java.util.Map; public class BabyCheckResult { private String id; + // 血红蛋白券 + private String hemoglobinCoupon; + //建档ID private String buildId; @@ -793,4 +796,12 @@ public class BabyCheckResult { public void setHighRisk(Integer highRisk) { this.highRisk = highRisk; } + + public void setHemoglobinCoupon(String hemoglobinCoupon) { + this.hemoglobinCoupon = hemoglobinCoupon; + } + + public String getHemoglobinCoupon() { + return hemoglobinCoupon; + } } -- 1.8.3.1