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 b9f9004..ab9a7a6 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 @@ -1645,6 +1645,9 @@ public class ViewFacade { } } + /** 优惠券编号 */ + result.setCouponCode(couponService.findByUsedId(id)); + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -1676,6 +1679,8 @@ public class ViewFacade { } result = getBabyCheckResult(checkModel,babyModel); + /** 优惠券编号 */ + result.setCouponCode(couponService.findByUsedId(id)); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index a7177ad..0f3c8f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -259,6 +259,8 @@ public class BabyCheckPageResult { //脐部 private String navel; + private String couponCode; + public String getNavel() { return navel; } @@ -882,4 +884,12 @@ public class BabyCheckPageResult { public void setBregmaValue(String bregmaValue) { this.bregmaValue = bregmaValue; } + + public String getCouponCode() { + return couponCode; + } + + public void setCouponCode(String couponCode) { + this.couponCode = couponCode; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 16f24c7..b67cc29 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -8,13 +8,10 @@ import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.pojo.BabyModel; -import org.mortbay.util.StringUtil; import java.util.Date; -import java.util.List; import java.util.Map; /** @@ -158,6 +155,7 @@ public class BabyPageResult implements IBasicResultConvert儿童保健券(三)
使用人次
"); couponReportMap.put("8_5", "
儿童保健券(四)
使用人次
"); couponReportMap.put("8_6", "
儿童保健券(五)
使用人次
"); + /** 产后 */ + couponReportMap.put("3_1", "
产后建档券
使用人次
"); + couponReportMap.put("4_1", "
分娩券
使用人次
"); + couponReportMap.put("6_1", "
42天访视券
使用人次
"); + couponReportMap.put("6_2", "
产后复查券(一)
使用人次
"); + couponReportMap.put("6_3", "
产后复查券(二)
使用人次
"); + couponReportMap.put("6_4", "
产后复查券(三)
使用人次
"); } @Override