From f557a7ab15ab5f80db0d1335eeefbfc2484f9469 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 2 Nov 2018 14:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E4=BC=98=E6=83=A0=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/permission/service/impl/CouponServiceImpl.java    | 2 +-
 .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
index 7e210bf..a8a5418 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
@@ -740,7 +740,7 @@ public class CouponServiceImpl implements CouponService {
             BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class);
             midDate = baby.getBirth();
         } else {
-            Patients patient = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
+            Patients patient = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
 
             if (personType == 1 || couponType == 4) { /** 孕妇根据末次月经对比 分娩券按照末次月经对比 */
                 midDate = patient.getLastMenses();
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 3e36567..3a66de0 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
@@ -176,6 +176,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         couponReportMap.put("10_8", "<div class='ag-double-line'>血红蛋白检查券(八)<div>使用人次</div></div>");
         couponReportMap.put("10_9", "<div class='ag-double-line'>血红蛋白检查券(九)<div>使用人次</div></div>");
         couponReportMap.put("10_10", "<div class='ag-double-line'>血红蛋白检查券(十)<div>使用人次</div></div>");
+
+        couponReportMap.put("11_1", "<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>");
-- 
1.8.3.1