From c5c5ae58fe2c4c3e48cf9f1bf53c9120fbc67015 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Wed, 24 May 2017 14:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=8E=A5=E5=8F=A3=20=E5=84=BF=E7=AB=A5=E5=BB=BA?=
 =?UTF-8?q?=E6=A1=A3=E6=9F=A5=E7=9C=8B=E6=8E=A5=E5=8F=A3=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E6=83=A0=E5=88=B8=E7=A0=81=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/ViewFacade.java     |  5 +++++
 .../platform/operate/web/result/BabyCheckPageResult.java     | 10 ++++++++++
 .../com/lyms/platform/operate/web/result/BabyPageResult.java | 12 +++++++++---
 .../platform/operate/web/service/impl/ReportServiceImpl.java |  7 +++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

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<BabyPageResult,BabyM
     //病历号(住院号)
     private String blNo;
 
+    private String couponCode;
 
     public String getId() {
         return id;
@@ -573,4 +571,12 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
 
         return this;
     }
+
+    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/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 2550d62..c49a21b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -94,6 +94,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         couponReportMap.put("8_4", "<div class='ag-double-line'>儿童保健券(三)<div><div>使用人次</div></div>");
         couponReportMap.put("8_5", "<div class='ag-double-line'>儿童保健券(四)<div>使用人次</div></div>");
         couponReportMap.put("8_6", "<div class='ag-double-line'>儿童保健券(五)<div>使用人次</div></div>");
+        /** 产后 */
+        couponReportMap.put("3_1", "<div class='ag-double-line'>产后建档券<div>使用人次</div></div>");
+        couponReportMap.put("4_1", "<div class='ag-double-line'>分娩券<div>使用人次</div></div>");
+        couponReportMap.put("6_1", "<div class='ag-double-line'>42天访视券<div>使用人次</div></div>");
+        couponReportMap.put("6_2", "<div class='ag-double-line'>产后复查券(一)<div>使用人次</div></div>");
+        couponReportMap.put("6_3", "<div class='ag-double-line'>产后复查券(二)<div>使用人次</div></div>");
+        couponReportMap.put("6_4", "<div class='ag-double-line'>产后复查券(三)<div>使用人次</div></div>");
     }
 
     @Override
-- 
1.8.3.1