diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java index 1321f2b..8feb4fb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java @@ -14,7 +14,7 @@ import java.util.List; public class NewbornVisit { /** 优惠券 */ - private String hemoglobinCoupon; + private String couponCode; private String id; @@ -155,12 +155,12 @@ public class NewbornVisit { // 下次访视时间 private Date nextVisitTimeDesc; - public String getHemoglobinCoupon() { - return hemoglobinCoupon; + public String getCouponCode() { + return couponCode; } - public void setHemoglobinCoupon(String hemoglobinCoupon) { - this.hemoglobinCoupon = hemoglobinCoupon; + public void setCouponCode(String couponCode) { + this.couponCode = couponCode; } public String getId() { 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 40042a0..8f566fa 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 @@ -253,6 +253,14 @@ public class BabyCheckFacade { } } + /** 验证产检券是否可用 可用就改为已使用状态(血红蛋白) */ + if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getHemoglobinCoupon()) && request.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(request.getHemoglobinCoupon(), request.getCouponType(), autoMatchFacade.getHospitalId(userId)); + if(resp.getErrorcode() != 0) { + return resp; + } + } + String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 0902e03..3d975b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -13,6 +13,9 @@ import java.util.Map; public class BabyCheckRequest { + /** 优惠券 */ + private String hemoglobinCoupon; + private String id; private String pid; @@ -262,6 +265,14 @@ public class BabyCheckRequest { //脐部 private Map navel; + public String getHemoglobinCoupon() { + return hemoglobinCoupon; + } + + public void setHemoglobinCoupon(String hemoglobinCoupon) { + this.hemoglobinCoupon = hemoglobinCoupon; + } + public Map getNavel() { return navel; }