Commit f557a7ab15ab5f80db0d1335eeefbfc2484f9469
1 parent
c79ac4861b
Exists in
master
and in
6 other branches
产筛优惠劵
Showing 2 changed files with 3 additions and 1 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
View file @
f557a7a
... | ... | @@ -740,7 +740,7 @@ |
740 | 740 | BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class); |
741 | 741 | midDate = baby.getBirth(); |
742 | 742 | } else { |
743 | - Patients patient = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); | |
743 | + Patients patient = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); | |
744 | 744 | |
745 | 745 | if (personType == 1 || couponType == 4) { /** 孕妇根据末次月经对比 分娩券按照末次月经对比 */ |
746 | 746 | midDate = patient.getLastMenses(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
f557a7a
... | ... | @@ -176,6 +176,8 @@ |
176 | 176 | couponReportMap.put("10_8", "<div class='ag-double-line'>血红蛋白检查券(八)<div>使用人次</div></div>"); |
177 | 177 | couponReportMap.put("10_9", "<div class='ag-double-line'>血红蛋白检查券(九)<div>使用人次</div></div>"); |
178 | 178 | couponReportMap.put("10_10", "<div class='ag-double-line'>血红蛋白检查券(十)<div>使用人次</div></div>"); |
179 | + | |
180 | + couponReportMap.put("11_1", "<div class='ag-double-line'>产筛券<div>使用人次</div></div>"); | |
179 | 181 | /** 产后 */ |
180 | 182 | couponReportMap.put("3_1", "<div class='ag-double-line'>产后建档券<div>使用人次</div></div>"); |
181 | 183 | couponReportMap.put("4_1", "<div class='ag-double-line'>分娩券<div>使用人次</div></div>"); |