From 833e8b474ec9a170c423fd1c7c410ee190fce492 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 5 Jun 2017 11:45:56 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml    |  4 ++--
 .../operate/web/service/impl/ReportServiceImpl.java       | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 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 b0c2f1a..830ed33 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -203,8 +203,8 @@
 
     <select id="findHospitals" parameterType="map" resultType="map">
         select a.coupon_template_group_id as id, b.name
-        from hospital_coupon_template_group a, organization b
-        where a.hospital_id = b.id and a.hospital_id in
+        from hospital_coupon_template_group a, coupon_template_group b
+        where a.coupon_template_group_id = b.id and a.hospital_id in
         <foreach collection="hospitalIds" open="(" close=")" separator="," item="hid">
             #{hid}
         </foreach>
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 eeed826..ab046fd 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
@@ -13,11 +13,14 @@ import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.service.IReportService;
 import com.lyms.platform.operate.web.utils.*;
+import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.permission.dao.master.CouponMapper;
 import com.lyms.platform.pojo.*;
 import com.lymsh.platform.reportdata.model.echarts.Series;
+import org.apache.commons.collections.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -618,7 +621,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 map.put("username", patients.getUsername()); /** 姓名 */
             }
             map.put("week", DateUtil.getWeek(antexc.getLastMenses(), antexc.getCheckTime()));/** 产检孕周 = 产检时间 - 末次月经 */
-            map.put("number", antexc.getProdTime()); /** 产检第几次 */
+
+            List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid())).with(new Sort(Sort.Direction.ASC, "checkTime")), AntExChuModel.class);
+            if(org.apache.commons.collections.CollectionUtils.isNotEmpty(antExChuModels)) {
+                for(int i = 0; i < antExChuModels.size(); i++) {
+                    if(antExChuModels.get(i).getId().equals(antexc.getId())) {
+                        map.put("number", ++i); /** 产检第几次 */
+                        return;
+                    }
+                }
+            }
+
             map.put("doctorName", couponMapper.findUserName(antexc.getProdDoctor())); /** 产检医生 */
             map.put("operatorOrgName", couponMapper.findUserName(antexc.getOperator() + "")); /** 产检机构 */
             PersonModel personModel = mongoTemplate.findById(map.get("user_id"), PersonModel.class);
-- 
1.8.3.1