From 68107759d06af0fa65daa02933ac615543c48351 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Thu, 1 Jun 2017 17:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml | 2 +-
 .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index dc8b616..c69c57c 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -223,7 +223,7 @@
     </select>
 
     <select id="findCouponInfo" parameterType="map" resultType="map">
-        select c.type, a.sequence_id, d.name, e.name as send_hospital
+        select c.type, a.sequence_id, d.name, e.name as send_hospital, a.use_date
         from coupon_info a, coupon_template b, coupon_type c, users d, organization e, hospital_coupon_template_group f
         where a.coupon_template_id = b.id and b.type_id = c.id and a.user_id = d.id and a.status=2 and a.create_hospital_id = e.id
         and a.used_hospital_id = #{hospitalId} and f.hospital_id = a.used_hospital_id and c.type in
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 f26ca7f..c6d7329 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
@@ -511,7 +511,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             if(patients != null) {
                 map.put("username", patients.getUsername()); /** 姓名 */
             }
-            map.put("week", DateUtil.getDays(antexc.getCheckTime(), antexc.getLastMenses()));/** 产检孕周 = 产检时间 - 末次月经 */
+            map.put("week", DateUtil.getWeek(antexc.getLastMenses(), antexc.getCheckTime()));/** 产检孕周 = 产检时间 - 末次月经 */
             map.put("number", antexc.getProdTime()); /** 产检第几次 */
             map.put("doctorName", couponMapper.findUserName(antexc.getProdDoctor())); /** 产检医生 */
             map.put("operatorOrgName", couponMapper.findUserName(antexc.getOperator() + "")); /** 产检机构 */
-- 
1.8.3.1